Changeset 26890 for trunk

Timestamp:

01/02/2014 01:06:58 AM (11 years ago)

Author:

azaozz

Message:

TinyMCE: add stubs for the missing tinymce.util.Cookie, windowManager.onOpen and windowManager.onClose to the compat3x plugin. See #24067, fixes #26750.

Location:

trunk/src/wp-includes

Files:

• js/tinymce/plugins/compat3x/plugin.js (modified) (4 diffs)
• version.php (modified) (1 diff)

trunk/src/wp-includes/js/tinymce/plugins/compat3x/plugin.js

@@ -32 +32 @@
         target = target || this;
 
+        if ( ! newEventName ) {
+            this.add = this.addToTop = this.remove = this.dispatch = function(){};
+            return;
+        }
+        
         this.add = function(callback, scope) {
             log('<target>.on' + newEventName + ".add(..)");
@@ -86 +91 @@
     }
 
+    tinymce.util.Dispatcher = Dispatcher;
     tinymce.onBeforeUnload = new Dispatcher(tinymce, "BeforeUnload");
     tinymce.onAddEditor = new Dispatcher(tinymce, "AddEditor", "editor");
     tinymce.onRemoveEditor = new Dispatcher(tinymce, "RemoveEditor", "editor");
+
+    function noop(){}
+
+    tinymce.util.Cookie = {
+        get: noop, getHash: noop, remove: noop, set: noop, setHash: noop
+    };
 
     function patchEditor(editor) {
@@ -133 +145 @@
                     this.buttons[name].active(state);
                 }
-            },
+            }
         };
 
@@ -194 +206 @@
             selection.onBeforeSetContent = new Dispatcher(editor, "BeforeSetContent", filterSelectionEvents(true), selection);
             selection.onSetContent = new Dispatcher(editor, "SetContent", filterSelectionEvents(true), selection);
-
-            editor.windowManager.createInstance = function(className, a, b, c, d, e) {
+        });
+
+        editor.on('BeforeRenderUI', function() {
+            var windowManager = editor.windowManager;
+
+            windowManager.onOpen = new Dispatcher();
+            windowManager.onClose = new Dispatcher();
+            windowManager.createInstance = function(className, a, b, c, d, e) {
                 log("windowManager.createInstance(..)");
 

trunk/src/wp-includes/version.php

@@ -19 +19 @@
  * @global string $tinymce_version
  */
-$tinymce_version = '4012-20131228';
+$tinymce_version = '4012-20140101';
 
 /**