vanilla ckeditor-3.5.4

[ckeditor.git] / _source / core / ckeditor_base.js

diff --git a/_source/core/ckeditor_base.js b/_source/core/ckeditor_base.js
index 419ee44..85f7751 100644 (file)
--- a/_source/core/ckeditor_base.js
+++ b/_source/core/ckeditor_base.js
@@ -12,11 +12,20 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 // Must be updated on changes in the script as well as updated in the\r
 // ckeditor_source.js and ckeditor_basic_source.js files.\r
 \r
-// if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'',version:'3.5.3',rev:'6655',_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f<e.length;f++){var g=e[f].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(g){d=g[1];break;}}}if(d.indexOf(':/')==-1)if(d.indexOf('/')===0)d=location.href.match(/^.*?:\/\/[^\/]*/)[0]+d;else d=location.href.match(/^[^\?]*\/(?:)/)[0]+d;return d;})(),getUrl:function(d){if(d.indexOf(':/')==-1&&d.indexOf('/')!==0)d=this.basePath+d;if(this.timestamp&&d.charAt(d.length-1)!='/')d+=(d.indexOf('?')>=0?'&':'?')+('t=')+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();\r
+// if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'',version:'3.5.4',rev:'6899',_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f<e.length;f++){var g=e[f].src.match(/(^|.*[\\\/])ckeditor(?:_basic)?(?:_source)?.js(?:\?.*)?$/i);if(g){d=g[1];break;}}}if(d.indexOf(':/')==-1)if(d.indexOf('/')===0)d=location.href.match(/^.*?:\/\/[^\/]*/)[0]+d;else d=location.href.match(/^[^\?]*\/(?:)/)[0]+d;return d;})(),getUrl:function(d){if(d.indexOf(':/')==-1&&d.indexOf('/')!==0)d=this.basePath+d;if(this.timestamp&&d.charAt(d.length-1)!='/')d+=(d.indexOf('?')>=0?'&':'?')+('t=')+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();\r
 \r
 // #### Raw code\r
 // ATTENTION: read the above "Compressed Code" notes when changing this code.\r
 \r
+/* @Packager.RemoveLine\r
+// Avoid having the editor code initialized twice. (#7588)\r
+// Use CKEDITOR.dom to check whether the full ckeditor.js code has been loaded\r
+// or just ckeditor_basic.js.\r
+// Remove these lines when compressing manually.\r
+if ( window.CKEDITOR && window.CKEDITOR.dom )\r
+       return;\r
+@Packager.RemoveLine */\r
+\r
 if ( !window.CKEDITOR )\r
 {\r
        /**\r
@@ -42,7 +51,7 @@ if ( !window.CKEDITOR )
                        // The production implementation contains a fixed timestamp, unique\r
                        // for each release and generated by the releaser.\r
                        // (Base 36 value of each component of YYMMDDHH - 4 chars total - e.g. 87bm == 08071122)\r
-                       timestamp : 'B37D54V',\r
+                       timestamp : 'B49D5BN',\r
 \r
                        /**\r
                         * Contains the CKEditor version number.\r
@@ -50,7 +59,7 @@ if ( !window.CKEDITOR )
                         * @example\r
                         * alert( CKEDITOR.version );  // e.g. 'CKEditor 3.4.1'\r
                         */\r
-                       version : '3.5.3',\r
+                       version : '3.5.4',\r
 \r
                        /**\r
                         * Contains the CKEditor revision number.\r
@@ -60,7 +69,7 @@ if ( !window.CKEDITOR )
                         * @example\r
                         * alert( CKEDITOR.revision );  // e.g. '3975'\r
                         */\r
-                       revision : '6655',\r
+                       revision : '6899',\r
 \r
                        /**\r
                         * Private object used to hold core stuff. It should not be used outside of\r