updated tinymce to 3.5.11

[friendica.git] / library / tinymce / jscripts / tiny_mce / plugins / inlinepopups / editor_plugin_src.js

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
index 67123ca3142ec46384858fda1a641ed6d2401700..da6ee2493282ba4d74f053377bc28be6d3ac0eb3 100644 (file)
--- a/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
@@ -55,12 +55,12 @@
                        if (parentWindow && DOM.get(parentWindow.id + '_ifr')) {\r
                                parentWindow.focussedElement = DOM.get(parentWindow.id + '_ifr').contentWindow.document.activeElement;\r
                        }\r
-                       \r
+\r
                        // Only store selection if the type is a normal window\r
                        if (!f.type)\r
                                t.bookmark = ed.selection.getBookmark(1);\r
 \r
-                       id = DOM.uniqueId();\r
+                       id = DOM.uniqueId("mce_inlinepopups_"); // Use a prefix so this can't conflict with other ids\r
                        vp = DOM.getViewPort();\r
                        f.width = parseInt(f.width || 320);\r
                        f.height = parseInt(f.height || 240) + (tinymce.isIE ? 8 : 0);\r
@@ -111,17 +111,17 @@
                                opt += ' mceMovable';\r
 \r
                        // Create DOM objects\r
-                       t._addAll(DOM.doc.body, \r
-                               ['div', {id : id, role : 'dialog', 'aria-labelledby': f.type ? id + '_content' : id + '_title', 'class' : (ed.settings.inlinepopups_skin || 'clearlooks2') + (tinymce.isIE && window.getSelection ? ' ie9' : ''), style : 'width:100px;height:100px'}, \r
+                       t._addAll(DOM.doc.body,\r
+                               ['div', {id : id, role : 'dialog', 'aria-labelledby': f.type ? id + '_content' : id + '_title', 'class' : (ed.settings.inlinepopups_skin || 'clearlooks2') + (tinymce.isIE && window.getSelection ? ' ie9' : ''), style : 'width:100px;height:100px'},\r
                                        ['div', {id : id + '_wrapper', 'class' : 'mceWrapper' + opt},\r
-                                               ['div', {id : id + '_top', 'class' : 'mceTop'}, \r
+                                               ['div', {id : id + '_top', 'class' : 'mceTop'},\r
                                                        ['div', {'class' : 'mceLeft'}],\r
                                                        ['div', {'class' : 'mceCenter'}],\r
                                                        ['div', {'class' : 'mceRight'}],\r
                                                        ['span', {id : id + '_title'}, f.title || '']\r
                                                ],\r
 \r
-                                               ['div', {id : id + '_middle', 'class' : 'mceMiddle'}, \r
+                                               ['div', {id : id + '_middle', 'class' : 'mceMiddle'},\r
                                                        ['div', {id : id + '_left', 'class' : 'mceLeft', tabindex : '0'}],\r
                                                        ['span', {id : id + '_content'}],\r
                                                        ['div', {id : id + '_right', 'class' : 'mceRight', tabindex : '0'}]\r
@@ -188,7 +188,7 @@
 \r
                                DOM.add(id + '_middle', 'div', {'class' : 'mceIcon'});\r
                                DOM.setHTML(id + '_content', f.content.replace('\n', '<br />'));\r
-                               \r
+\r
                                Event.add(id, 'keyup', function(evt) {\r
                                        var VK_ESCAPE = 27;\r
                                        if (evt.keyCode === VK_ESCAPE) {\r
@@ -268,7 +268,7 @@
                                        }\r
                                }\r
                        });\r
-                       \r
+\r
                        // Make sure the tab order loops within the dialog.\r
                        Event.add([id + '_left', id + '_right'], 'focus', function(evt) {\r
                                var iframe = DOM.get(id + '_ifr');\r
@@ -284,7 +284,7 @@
                                        DOM.get(id + '_ok').focus();\r
                                }\r
                        });\r
-                       \r
+\r
                        // Add window\r
                        w = t.windows[id] = {\r
                                id : id,\r
@@ -341,7 +341,7 @@
                                DOM.removeClass(t.lastId, 'mceFocus');\r
                                DOM.addClass(id, 'mceFocus');\r
                                t.lastId = id;\r
-                               \r
+\r
                                if (w.focussedElement) {\r
                                        w.focussedElement.focus();\r
                                } else if (DOM.get(id + '_ok')) {\r
@@ -486,7 +486,7 @@
 \r
                                        dw = v;\r
                                }\r
-       \r
+\r
                                if (dh < (v = w.features.min_height - sz.h)) {\r
                                        if (dy !== 0)\r
                                                dy += dh - v;\r
@@ -505,7 +505,7 @@
                                if (dx + dy !== 0) {\r
                                        if (sx + dx < 0)\r
                                                dx = 0;\r
-       \r
+\r
                                        if (sy + dy < 0)\r
                                                dy = 0;\r
 \r
@@ -567,7 +567,7 @@
                                        t.focus(fw.id);\r
                        }\r
                },\r
-               \r
+\r
                // Find front most window\r
                _frontWindow : function() {\r
                        var fw, ix = 0;\r