X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fcore%2Fckeditor_base.js;h=85f77514980356fe3f6a743cc59702b93f12e7f5;hp=419ee44679f78f2fb219d9f1496f34b658a48728;hb=1056598c95187351dc58f4991d331e2258d038b5;hpb=4e90e78dc97789709ee7404359a5517540c27553

diff --git a/_source/core/ckeditor_base.js b/_source/core/ckeditor_base.js
index 419ee44..85f7751 100644
--- 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
 // ckeditor_source.js and ckeditor_basic_source.js files.
 
-// 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;})();
+// 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;})();
 
 // #### Raw code
 // ATTENTION: read the above "Compressed Code" notes when changing this code.
 
+/* @Packager.RemoveLine
+// Avoid having the editor code initialized twice. (#7588)
+// Use CKEDITOR.dom to check whether the full ckeditor.js code has been loaded
+// or just ckeditor_basic.js.
+// Remove these lines when compressing manually.
+if ( window.CKEDITOR && window.CKEDITOR.dom )
+	return;
+@Packager.RemoveLine */
+
 if ( !window.CKEDITOR )
 {
 	/**
@@ -42,7 +51,7 @@ if ( !window.CKEDITOR )
 			// The production implementation contains a fixed timestamp, unique
 			// for each release and generated by the releaser.
 			// (Base 36 value of each component of YYMMDDHH - 4 chars total - e.g. 87bm == 08071122)
-			timestamp : 'B37D54V',
+			timestamp : 'B49D5BN',
 
 			/**
 			 * Contains the CKEditor version number.
@@ -50,7 +59,7 @@ if ( !window.CKEDITOR )
 			 * @example
 			 * alert( CKEDITOR.version );  // e.g. 'CKEditor 3.4.1'
 			 */
-			version : '3.5.3',
+			version : '3.5.4',
 
 			/**
 			 * Contains the CKEditor revision number.
@@ -60,7 +69,7 @@ if ( !window.CKEDITOR )
 			 * @example
 			 * alert( CKEDITOR.revision );  // e.g. '3975'
 			 */
-			revision : '6655',
+			revision : '6899',
 
 			/**
 			 * Private object used to hold core stuff. It should not be used outside of