Ticket #3629: 3629.patch

_source/core/config.js

@@ -154 +154 @@
 
         /**
          * List of additional plugins to be loaded. This is a tool setting which
-         * makes it easier to add new plugins, whithout having to touch and
+         * makes it easier to add new plugins, without having to touch and
          * possibly breaking the <i>plugins</i> setting.
          * @type String
          * @example
@@ -164 +164 @@
 
         /**
          * List of plugins that must not be loaded. This is a tool setting which
-         * makes it easier to avoid loading plugins definied in the <i>plugins</i>
-         * setting, whithout having to touch and possibly breaking it.
+         * makes it easier to avoid loading plugins defined in the <i>plugins</i>
+         * setting, without having to touch and possibly breaking it.
          * @type String
          * @example
          * config.removePlugins = 'elementspath,save,font';

_source/plugins/domiterator/plugin.js

@@ -67 +67 @@
                         // The range object used to identify the paragraph contents.
                         var range;
 
-                        // Indicats that the current element in the loop is the last one.
+                        // Indicates that the current element in the loop is the last one.
                         var isLast;
 
                         // Instructs to cleanup remaining BRs.

_source/plugins/richcombo/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -270 +270 @@
                                 { 
                                         me._.on = 0; 
                                         me.setState( CKEDITOR.TRISTATE_OFF ); 
-                                }
+                                };
 
                         if ( this.init )
                                 this.init();

_source/plugins/scayt/plugin.js

@@ -48 +48 @@
                 editor.on( 'contentDomUnload', function()
                         {
                                 // Remove scripts.
-                                var scripts = CKEDITOR.document.getElementsByTag( 'script' );
-                                scaytIdRegex =  /^dojoIoScript(\d+)$/i;
-                                scaytSrcRegex =  /^http:\/\/demo\.spellchecker\.net\/spellcheck3\/script\/ssrv\.cgi/i;
+                                var scripts = CKEDITOR.document.getElementsByTag( 'script' ),
+                                        scaytIdRegex =  /^dojoIoScript(\d+)$/i,
+                                        scaytSrcRegex =  /^http:\/\/demo\.spellchecker\.net\/spellcheck3\/script\/ssrv\.cgi/i;
 
                                 for ( var i=0; i < scripts.count(); i++ )
                                 {

_source/plugins/smiley/dialogs/smiley.js

@@ -44 +44 @@
                 editor.insertElement( img );
 
                 dialog.hide();
-        }
+        };
 
         var onKeydown = CKEDITOR.tools.addFunction( function( ev, element )
         {

_source/plugins/tabletools/plugin.js

@@ -39 +39 @@
 
                 for ( var i = 0 ; i < ranges.length ; i++ )
                 {
-                        var range = ranges[ i ];
-                        var walker = new CKEDITOR.dom.walker( range );
+                        var range = ranges[ i ],
+                                walker = new CKEDITOR.dom.walker( range ),
+                                node;
+
                         walker.guard = moveOutOfCellGuard;
 
                         while ( ( node = walker.next() ) )

_source/plugins/wsc/dialogs/wsc.js

@@ -55 +55 @@
                                 initAndSpell( dialog );
                         }
                         else if ( i++ == 180 )                                                          // Timeout: 180 * 250ms = 45s.
-                                _cancelOnError( errorMsg );
+                                window._cancelOnError( errorMsg );
                 };
         }
 

_source/plugins/wysiwygarea/plugin.js

@@ -80 +80 @@
                                 // the parent blocks until we reach blockLimit.
                                 var parent, dtd;
                                 if ( this.config.enterMode != CKEDITOR.ENTER_BR && isBlock )
+                                {
                                         while( ( parent = range.getCommonAncestor( false, true ) )
                                                         && ( dtd = CKEDITOR.dtd[ parent.getName() ] )
                                                         && !( dtd && dtd [ elementName ] ) )
                                                 range.splitBlock();
+                                }
 
                                 // Insert the new node.
                                 range.insertNode( clone );
@@ -137 +139 @@
                         {
                                 var brNodeList = fixedBlock.getElementsByTag( 'br' ), brNode;
                                 for ( var i = 0 ; i < brNodeList.count() ; i++ )
-                                        if( ( brNode = brNodeList.getItem( i ) ) && brNode.hasAttribute( '_fck_bookmark' ) )
+                                {
+                                        if ( ( brNode = brNodeList.getItem( i ) ) && brNode.hasAttribute( '_fck_bookmark' ) )
                                                 brNode.remove();
+                                }
                         }
 
                         selection.selectBookmarks( bms );