[Testbot] Plone 4.3 - Python 2.6 - Build # 2289 - Still failing! - 1 failure(s)

[jenkins at plone.org]

-------------------------------------------------------------------------------
Plone 4.3 - Python 2.6 - Build # 2289 - Still Failing!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-4.3-python-2.6/2289/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: Products.TinyMCE
Branch: refs/heads/1.3.x
Date: 2014-09-01T20:41:35+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits at vanrees.org>
Commit: https://github.com/plone/Products.TinyMCE/commit/a0f8447dc5df97dc0e2fe75f1ce6e74ace6eac5d

Call convertURL when inserting link or image.

Fixes https://dev.plone.org/ticket/13721

Files changed:
M HISTORY.rst
M Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js

diff --git a/HISTORY.rst b/HISTORY.rst
index a465dd6..5497d3f 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -5,7 +5,11 @@ HISTORY
 1.3.7 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Call convertURL when inserting link or image.
+  Fixes `#13721`__.
+  [maurits]
+
+__ https://dev.plone.org/ticket/13721
 
 
 1.3.6 (2014-02-19)
diff --git a/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js b/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
index 32964b0..1b5f40d 100755
--- a/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
+++ b/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
@@ -488,7 +488,8 @@ BrowserDialog.prototype.insertLink = function () {
 
     switch (active_panel) {
         case "#internal":
-            link = this.current_link;
+            link = this.editor.convertURL(this.current_link);
+
             anchor = jq('#pageanchor', document).val();
             if (anchor) {
                 link += '#' + anchor;
@@ -586,7 +587,7 @@ BrowserDialog.prototype.insertLink = function () {
 BrowserDialog.prototype.insertImage = function () {
     var attrs = {},
         selected_node = this.editor.selection.getNode(),
-        href = this.current_link,
+        href = this.editor.convertURL(this.current_link),
         active_panel = jq('#linktype .current a', document).attr('href'),
         dimension,
         classes;


Repository: Products.TinyMCE
Branch: refs/heads/1.3.x
Date: 2014-09-02T08:59:10+02:00
Author: Jens W. Klein (jensens) <jens at bluedynamics.com>
Commit: https://github.com/plone/Products.TinyMCE/commit/6d51558b91640cc2fa9e415b8680bbe8ec20d83a

Merge pull request #82 from plone/maurits-call-converturl-13721

Call convertURL when inserting link or image.

Files changed:
M HISTORY.rst
M Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js

diff --git a/HISTORY.rst b/HISTORY.rst
index a465dd6..5497d3f 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -5,7 +5,11 @@ HISTORY
 1.3.7 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Call convertURL when inserting link or image.
+  Fixes `#13721`__.
+  [maurits]
+
+__ https://dev.plone.org/ticket/13721
 
 
 1.3.6 (2014-02-19)
diff --git a/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js b/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
index 32964b0..1b5f40d 100755
--- a/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
+++ b/Products/TinyMCE/skins/tinymce/plugins/plonebrowser/js/plonebrowser.js
@@ -488,7 +488,8 @@ BrowserDialog.prototype.insertLink = function () {
 
     switch (active_panel) {
         case "#internal":
-            link = this.current_link;
+            link = this.editor.convertURL(this.current_link);
+
             anchor = jq('#pageanchor', document).val();
             if (anchor) {
                 link += '#' + anchor;
@@ -586,7 +587,7 @@ BrowserDialog.prototype.insertLink = function () {
 BrowserDialog.prototype.insertImage = function () {
     var attrs = {},
         selected_node = this.editor.selection.getNode(),
-        href = this.current_link,
+        href = this.editor.convertURL(this.current_link),
         active_panel = jq('#linktype .current a', document).attr('href'),
         dimension,
         classes;




-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 3803 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140902/526b8082/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 165209 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140902/526b8082/attachment-0003.obj>