Merge branch 'toolbarUI' into staging

5 years ago · 7bf7731803
parent 264f4950bd c321bc169e
commit 7bf7731803
1 changed files with 1 additions and 0 deletions
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@ -997,6 +997,7 @@ define([
                    }
                    return _getPath(name);
                };
+                window.__defineGetter__('_cke_htmlToLoad', function() {});
                editor.plugins.mediatag.import = function($mt) {
                    framework._.sfCommon.importMediaTag($mt);
                };