Index: /CKEditor/branches/prototype/_dev/jslint/lint.conf
===================================================================
--- /CKEditor/branches/prototype/_dev/jslint/lint.conf (revision 2261)
+++ /CKEditor/branches/prototype/_dev/jslint/lint.conf (revision 2262)
@@ -22,5 +22,5 @@
+unreachable_code # unreachable code
+missing_break # missing break statement
-+missing_break_for_last_case # missing break statement for last case in switch
+-missing_break_for_last_case # missing break statement for last case in switch
+comparison_type_conv # comparisons against null, 0, true, false, or an empty string allowing implicit type conversion (use === or !==)
-inc_dec_within_stmt # increment (++) and decrement (--) operators used as part of greater statement
Index: /CKEditor/branches/prototype/_dev/packager/fckpackager.php
===================================================================
--- /CKEditor/branches/prototype/_dev/packager/fckpackager.php (revision 2261)
+++ /CKEditor/branches/prototype/_dev/packager/fckpackager.php (revision 2262)
@@ -316,5 +316,5 @@
'/\/\/.*$/m',
'', $script ) ;
-
+
// Remove spaces before the ";" at the end of the lines
$script = preg_replace(
Index: /CKEditor/branches/prototype/_dev/packager/packagefilegen.html
===================================================================
--- /CKEditor/branches/prototype/_dev/packager/packagefilegen.html (revision 2261)
+++ /CKEditor/branches/prototype/_dev/packager/packagefilegen.html (revision 2262)
@@ -31,6 +31,18 @@
document.getElementById( 'full' ).contentWindow.generate();
+ var CKEDITOR = document.getElementById( 'full' ).contentWindow.CKEDITOR;
+
var output = document.getElementById( 'output' );
output.value = document.getElementById( 'header' ).value + '\r\n\r\n';
+
+ output.value += '\t\r\n';
+
+ for ( var prop in CKEDITOR )
+ {
+ var typeOfProp = typeof CKEDITOR[ prop ];
+ if ( /^[A-Z\d$_]+$/.test( prop ) && typeOfProp != 'object' && typeOfProp != 'function' && typeOfProp != 'undefined' )
+ output.value += '\t\t\r\n';
+ }
+ output.value += '\t\r\n\r\n';
output.value += document.getElementById( 'basic' ).contentDocument.getElementById( 'output' ).value + '\r\n';
Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_domobject.js.html
===================================================================
--- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_domobject.js.html (revision 2261)
+++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_domobject.js.html (revision 2262)
@@ -58,5 +58,5 @@
51 if ( !( this._ = this.getCustomData( '_' ) ) )
52 this.setCustomData( '_', ( this._ = {} ) );
- 53
+ 53
54 // Call the base event constructor.
55 CKEDITOR.event.call( this );
@@ -132,5 +132,5 @@
125 {
126 var customData = {};
-127
+127
128 /**
129 * Determines whether the specified object is equal to the current object.
@@ -147,5 +147,5 @@
140 {
141 return ( object && object.$ === this.$ );
-142 },
+142 };
143
144 /**
Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_node.js.html
===================================================================
--- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_node.js.html (revision 2261)
+++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_node.js.html (revision 2262)
@@ -91,5 +91,5 @@
84 return element;
85 },
- 86
+ 86
87 /**
88 * Gets the parent element for this node.
Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__editor.js.html
===================================================================
--- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__editor.js.html (revision 2261)
+++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__editor.js.html (revision 2262)
@@ -251,10 +251,10 @@
244 throw 'Unknown command name "' + commandName + '"';
245 },
-246
+246
247 getCommand : function( commandName )
248 {
249 return this._.commands[ commandName ] || null;
250 },
-251
+251
252 // Both fire and fireOnce will always pass this editor instance as the
253 // "editor" param in CKEDITOR.event.fire. So, we override it to do that
Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__loader.js.html
===================================================================
--- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__loader.js.html (revision 2261)
+++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__loader.js.html (revision 2262)
@@ -49,5 +49,5 @@
42 'core/_bootstrap' : [ 'core/config', 'core/ckeditor', 'core/plugins', 'core/scriptLoader', 'core/tools', /* The following are entries that we wnat to force loading to at the end to avoid dependence recursion */ 'core/dom/text' ],
43 'core/ajax' : [ 'core/xml' ],
- 44 'core/ckeditor' : [ 'core/ajax', 'core/ckeditor_basic', 'core/dom', 'core/dom/document', 'core/dom/element', 'core/editor', 'core/event', 'core/listslib', 'core/tools' ],
+ 44 'core/ckeditor' : [ 'core/ajax', 'core/ckeditor_basic', 'core/dom', 'core/dom/document', 'core/dom/element', 'core/editor', 'core/event', 'core/tools' ],
45 'core/ckeditor_base' : [],
46 'core/ckeditor_basic' : [ 'core/env', 'core/event' ],
@@ -64,130 +64,129 @@
57 'core/env' : [],
58 'core/event' : [],
- 59 'core/listslib' : [],
- 60 'core/plugins' : [ 'core/resourceManager' ],
- 61 'core/resourceManager' : [ 'core/scriptLoader', 'core/tools' ],
- 62 'core/scriptLoader' : [ 'core/dom/element', 'core/env' ],
- 63 'core/skins' : [],
- 64 'core/themes' : [ 'lang/en', 'core/resourceManager' ],
- 65 'core/tools' : [ 'core/env' ],
- 66 'core/xml' : [ 'core/env' ]
- 67 };
- 68
- 69 var basePath = (function()
- 70 {
- 71 // This is a copy of CKEDITOR.basePath, but requires the script having
- 72 // "_source/core/loader.js".
- 73 if ( CKEDITOR && CKEDITOR.basePath )
- 74 return CKEDITOR.basePath;
- 75
- 76 // Find out the editor directory path, based on its <script> tag.
- 77 var path = '';
- 78 var scripts = document.getElementsByTagName( 'script' );
- 79
- 80 for ( var i = 0 ; i < scripts.length ; i++ )
- 81 {
- 82 var match = scripts[i].src.match( /(^|.*[\\\/])core\/loader.js(?:\?.*)?$/i );
- 83
- 84 if ( match )
- 85 {
- 86 path = match[1];
- 87 break;
- 88 }
- 89 }
- 90
- 91 // In IE (only) the script.src string is the raw valued entered in the
- 92 // HTML. Other browsers return the full resolved URL instead.
- 93 if ( path.indexOf('://') == -1 )
- 94 {
- 95 // Absolute path.
- 96 if ( path.indexOf( '/' ) === 0 )
- 97 path = location.href.match( /^.*?:\/\/[^\/]*/ )[0] + path;
- 98 // Relative path.
- 99 else
-100 path = location.href.match( /^[^\?]*\// )[0] + path;
-101 }
-102
-103 return path;
-104 })();
-105
-106 var timestamp = ( CKEDITOR && CKEDITOR.timestamp ) || ( new Date() ).valueOf(); // @Packager.RemoveLine
-107 /* // @Packager.RemoveLine
-108 * The production implementation contains a fixed timestamp // @Packager.RemoveLine
-109 * generated by the releaser // @Packager.RemoveLine
-110 var timestamp = '%TIMESTAMP%';
-111 */ // @Packager.RemoveLine
-112
-113 var getUrl = function( resource )
-114 {
-115 if ( CKEDITOR && CKEDITOR.getUrl )
-116 return CKEDITOR.getUrl( resource );
-117
-118 return basePath + resource +
-119 ( resource.indexOf( '?' ) >= 0 ? '&' : '?' ) +
-120 't=' + timestamp;
-121 };
-122
-123 /** @lends CKEDITOR.loader */
-124 return {
-125 /**
-126 * The list of loaded scripts in their loading order.
-127 * @type Array
-128 * @example
-129 * // Alert the loaded script names.
-130 * alert( <b>CKEDITOR.loader.loadedScripts</b> );
-131 */
-132 loadedScripts : [],
-133
-134 /**
-135 * Loads a specific script, including its dependencies. This is not a
-136 * synchronous loading, which means that the code the be loaded will
-137 * not necessarily be available after this call.
-138 * @example
-139 * CKEDITOR.loader.load( 'core/dom/element' );
-140 */
-141 load : function( scriptName )
-142 {
-143 // Check if the script has already been loaded.
-144 if ( scriptName in this.loadedScripts )
-145 return;
-146
-147 // Get the script dependencies list.
-148 var dependencies = scripts[ scriptName ];
-149 if ( !dependencies )
-150 throw 'The script name"' + scriptName + '" is not defined.';
-151
-152 // Mark the script as loaded, even before really loading it, to
-153 // avoid cross references recursion.
-154 this.loadedScripts[ scriptName ] = true;
-155
-156 // Load all dependencies first.
-157 for ( var i = 0 ; i < dependencies.length ; i++ )
-158 this.load( dependencies[ i ] );
-159
-160 // Append this script to the list of loaded scripts.
-161 this.loadedScripts.push( scriptName );
-162
-163 var scriptSrc = getUrl( '_source/' + scriptName + '.js' );
-164
-165 // Append the <script> element to the DOM.
-166 if ( document.body )
-167 {
-168 var script = document.createElement( 'script' );
-169 script.type = 'text/javascript';
-170 script.src = scriptSrc;
-171
-172 document.body.appendChild( script );
-173 }
-174 else
-175 document.write( '<script src="' + scriptSrc + '" type="text/javascript"><\/script>' );
-176 }
-177 };
-178 })();
-179
-180 // Check if any script has been defined for autoload.
-181 if ( CKEDITOR._autoLoad )
-182 {
-183 CKEDITOR.loader.load( CKEDITOR._autoLoad );
-184 delete CKEDITOR._autoLoad;
-185 }
-186