X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Fckeditor_base.js;h=7ff0e0c57f23b5f1802381310ec8b84a10cfa87f;hb=4e70ea24db840898be8cc21c950363a52a2a6aba;hp=2d3a0fbb3ba1b842ed3dd50e95611fe795d63681;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git

diff --git a/_source/core/ckeditor_base.js b/_source/core/ckeditor_base.js
index 2d3a0fb..7ff0e0c 100644
--- a/_source/core/ckeditor_base.js
+++ b/_source/core/ckeditor_base.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -9,20 +9,28 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
  */
 
 // #### Compressed Code
-// Must be updated on changes in the script, as well as updated in the
+// 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.0',rev:'4148',_:{},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.6',rev:'6902',_:{},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 )
 {
 	/**
-	 * This is the API entry point. The entire CKEditor code runs under this object.
 	 * @name CKEDITOR
-	 * @namespace
+	 * @namespace This is the API entry point. The entire CKEditor code runs under this object.
 	 * @example
 	 */
 	window.CKEDITOR = (function()
@@ -34,36 +42,37 @@ if ( !window.CKEDITOR )
 			/**
 			 * A constant string unique for each release of CKEditor. Its value
 			 * is used, by default, to build the URL for all resources loaded
-			 * by the editor code, guaranteing clean cache results when
+			 * by the editor code, guaranteeing clean cache results when
 			 * upgrading.
 			 * @type String
 			 * @example
 			 * alert( CKEDITOR.timestamp );  // e.g. '87dm'
 			 */
 			// The production implementation contains a fixed timestamp, unique
-			// for each release, generated by the releaser.
+			// for each release and generated by the releaser.
 			// (Base 36 value of each component of YYMMDDHH - 4 chars total - e.g. 87bm == 08071122)
-			timestamp : '97KD',
+			timestamp : 'B49E5BQ',
 
 			/**
 			 * Contains the CKEditor version number.
 			 * @type String
 			 * @example
-			 * alert( CKEDITOR.version );  // e.g. 'CKEditor 3.0 Beta'
+			 * alert( CKEDITOR.version );  // e.g. 'CKEditor 3.4.1'
 			 */
-			version : '3.0',
+			version : '3.6',
 
 			/**
 			 * Contains the CKEditor revision number.
-			 * Revision number is incremented automatically after each modification of CKEditor source code.
+			 * The revision number is incremented automatically, following each
+			 * modification to the CKEditor source code.
 			 * @type String
 			 * @example
 			 * alert( CKEDITOR.revision );  // e.g. '3975'
 			 */
-			revision : '4148',
+			revision : '6902',
 
 			/**
-			 * Private object used to hold core stuff. It should not be used out of
+			 * Private object used to hold core stuff. It should not be used outside of
 			 * the API code as properties defined here may change at any time
 			 * without notice.
 			 * @private
@@ -71,17 +80,17 @@ if ( !window.CKEDITOR )
 			_ : {},
 
 			/**
-			 * Indicates the API loading status. The following status are available:
+			 * Indicates the API loading status. The following statuses are available:
 			 *		<ul>
 			 *			<li><b>unloaded</b>: the API is not yet loaded.</li>
 			 *			<li><b>basic_loaded</b>: the basic API features are available.</li>
 			 *			<li><b>basic_ready</b>: the basic API is ready to load the full core code.</li>
 			 *			<li><b>loading</b>: the full API is being loaded.</li>
-			 *			<li><b>ready</b>: the API can be fully used.</li>
+			 *			<li><b>loaded</b>: the API can be fully used.</li>
 			 *		</ul>
 			 * @type String
 			 * @example
-			 * if ( <b>CKEDITOR.status</b> == 'ready' )
+			 * if ( <b>CKEDITOR.status</b> == 'loaded' )
 			 * {
 			 *     // The API can now be fully used.
 			 * }
@@ -90,16 +99,16 @@ if ( !window.CKEDITOR )
 
 			/**
 			 * Contains the full URL for the CKEditor installation directory.
-			 * It's possible to manually provide the base path by setting a
+			 * It is possible to manually provide the base path by setting a
 			 * global variable named CKEDITOR_BASEPATH. This global variable
-			 * must be set "before" the editor script loading.
+			 * must be set <strong>before</strong> the editor script loading.
 			 * @type String
 			 * @example
 			 * alert( <b>CKEDITOR.basePath</b> );  // "http://www.example.com/ckeditor/" (e.g.)
 			 */
 			basePath : (function()
 			{
-				// ATTENTION: fixes on this code must be ported to
+				// ATTENTION: fixes to this code must be ported to
 				// var basePath in "core/loader.js".
 
 				// Find out the editor directory path, based on its <script> tag.
@@ -121,9 +130,9 @@ if ( !window.CKEDITOR )
 					}
 				}
 
-				// In IE (only) the script.src string is the raw valued entered in the
-				// HTML. Other browsers return the full resolved URL instead.
-				if ( path.indexOf('://') == -1 )
+				// In IE (only) the script.src string is the raw value entered in the
+				// HTML source. Other browsers return the full resolved URL instead.
+				if ( path.indexOf(':/') == -1 )
 				{
 					// Absolute path.
 					if ( path.indexOf( '/' ) === 0 )
@@ -133,18 +142,24 @@ if ( !window.CKEDITOR )
 						path = location.href.match( /^[^\?]*\/(?:)/ )[0] + path;
 				}
 
+				if ( !path )
+						throw 'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';
+
 				return path;
 			})(),
 
 			/**
 			 * Gets the full URL for CKEditor resources. By default, URLs
-			 * returned by this function contains a querystring parameter ("t")
-			 * set to the {@link CKEDITOR.timestamp} value.
-			 * It's possible to provide a custom implementation to this
+			 * returned by this function contain a querystring parameter ("t")
+			 * set to the {@link CKEDITOR.timestamp} value.<br />
+			 * <br />
+			 * It is possible to provide a custom implementation of this
 			 * function by setting a global variable named CKEDITOR_GETURL.
-			 * This global variable must be set "before" the editor script
-			 * loading. If the custom implementation returns nothing, the
+			 * This global variable must be set <strong>before</strong> the editor script
+			 * loading. If the custom implementation returns nothing (==null), the
 			 * default implementation is used.
+			 * @param {String} resource The resource whose full URL we want to get.
+			 *		It may be a full, absolute, or relative URL.
 			 * @returns {String} The full URL.
 			 * @example
 			 * // e.g. http://www.example.com/ckeditor/skins/default/editor.css?t=87dm
@@ -159,11 +174,11 @@ if ( !window.CKEDITOR )
 			getUrl : function( resource )
 			{
 				// If this is not a full or absolute path.
-				if ( resource.indexOf('://') == -1 && resource.indexOf( '/' ) !== 0 )
+				if ( resource.indexOf(':/') == -1 && resource.indexOf( '/' ) !== 0 )
 					resource = this.basePath + resource;
 
 				// Add the timestamp, except for directories.
-				if ( this.timestamp && resource.charAt( resource.length - 1 ) != '/' )
+				if ( this.timestamp && resource.charAt( resource.length - 1 ) != '/' && !(/[&?]t=/).test( resource ) )
 					resource += ( resource.indexOf( '?' ) >= 0 ? '&' : '?' ) + 't=' + this.timestamp;
 
 				return resource;
@@ -187,4 +202,26 @@ if ( !window.CKEDITOR )
 	})();
 }
 
+/**
+ * Function called upon loading a custom configuration file that can
+ * modify the editor instance configuration ({@link CKEDITOR.editor#config }).
+ * It is usually defined inside the custom configuration files that can
+ * include developer defined settings.
+ * @name CKEDITOR.editorConfig
+ * @function
+ * @param {CKEDITOR.config} config A configuration object containing the
+ *		settings defined for a {@link CKEDITOR.editor} instance up to this
+ *		function call. Note that not all settings may still be available. See
+ *		<a href="http://docs.cksource.com/CKEditor_3.x/Developers_Guide/Setting_Configurations#Configuration_Loading_Order">Configuration Loading Order</a>
+ *		for details.
+ * @example
+ * // This is supposed to be placed in the config.js file.
+ * CKEDITOR.editorConfig = function( config )
+ * {
+ *     // Define changes to default configuration here. For example:
+ *     config.language = 'fr';
+ *     config.uiColor = '#AADC6E';
+ * };
+ */
+
 // PACKAGER_RENAME( CKEDITOR )