vanilla ckeditor-3.4.3

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

diff --git a/_source/core/ckeditor_base.js b/_source/core/ckeditor_base.js
index 8a8e62f..de403e9 100644 (file)
--- a/_source/core/ckeditor_base.js
+++ b/_source/core/ckeditor_base.js
@@ -12,7 +12,7 @@ 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.3',rev:'5542',_:{},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.4.3',rev:'6236',_:{},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
@@ -20,9 +20,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 if ( !window.CKEDITOR )\r
 {\r
        /**\r
-        * This is the API entry point. The entire CKEditor code runs under this object.\r
         * @name CKEDITOR\r
-        * @namespace\r
+        * @namespace This is the API entry point. The entire CKEditor code runs under this object.\r
         * @example\r
         */\r
        window.CKEDITOR = (function()\r
@@ -43,24 +42,25 @@ if ( !window.CKEDITOR )
                        // The production implementation contains a fixed timestamp, unique\r
                        // for each release, generated by the releaser.\r
                        // (Base 36 value of each component of YYMMDDHH - 4 chars total - e.g. 87bm == 08071122)\r
-                       timestamp : 'A4SD49Y',\r
+                       timestamp : 'ABH04T8',\r
 \r
                        /**\r
                         * Contains the CKEditor version number.\r
                         * @type String\r
                         * @example\r
-                        * alert( CKEDITOR.version );  // e.g. 'CKEditor 3.0 Beta'\r
+                        * alert( CKEDITOR.version );  // e.g. 'CKEditor 3.4.1'\r
                         */\r
-                       version : '3.3',\r
+                       version : '3.4.3',\r
 \r
                        /**\r
                         * Contains the CKEditor revision number.\r
-                        * Revision number is incremented automatically after each modification of CKEditor source code.\r
+                        * The revision number is incremented automatically, following each\r
+                        * modification to the CKEditor source code.\r
                         * @type String\r
                         * @example\r
                         * alert( CKEDITOR.revision );  // e.g. '3975'\r
                         */\r
-                       revision : '5542',\r
+                       revision : '6236',\r
 \r
                        /**\r
                         * Private object used to hold core stuff. It should not be used out of\r
@@ -142,12 +142,15 @@ if ( !window.CKEDITOR )
                        /**\r
                         * Gets the full URL for CKEditor resources. By default, URLs\r
                         * returned by this function contains a querystring parameter ("t")\r
-                        * set to the {@link CKEDITOR.timestamp} value.\r
+                        * set to the {@link CKEDITOR.timestamp} value.<br />\r
+                        * <br />\r
                         * It's possible to provide a custom implementation to this\r
                         * function by setting a global variable named CKEDITOR_GETURL.\r
                         * This global variable must be set "before" the editor script\r
-                        * loading. If the custom implementation returns nothing, the\r
+                        * loading. If the custom implementation returns nothing (==null), the\r
                         * default implementation is used.\r
+                        * @param {String} resource The resource to which get the full URL.\r
+                        *              It may be a full, absolute or relative URL.\r
                         * @returns {String} The full URL.\r
                         * @example\r
                         * // e.g. http://www.example.com/ckeditor/skins/default/editor.css?t=87dm\r
@@ -166,7 +169,7 @@ if ( !window.CKEDITOR )
                                        resource = this.basePath + resource;\r
 \r
                                // Add the timestamp, except for directories.\r
-                               if ( this.timestamp && resource.charAt( resource.length - 1 ) != '/' )\r
+                               if ( this.timestamp && resource.charAt( resource.length - 1 ) != '/' && !(/[&?]t=/).test( resource ) )\r
                                        resource += ( resource.indexOf( '?' ) >= 0 ? '&' : '?' ) + 't=' + this.timestamp;\r
 \r
                                return resource;\r