Merge branch 't/11081' into major

ckeditor · Nov 7, 2013 · b118c02 · b118c02
2 parents 7642fa2 + bb7f916
commit b118c02
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/core/style.js b/core/style.js
@@ -488,7 +488,7 @@ CKEDITOR.STYLE_OBJECT = 3;
 
 	function checkIfTextOrReadonlyOrEmptyElement( currentNode, nodeIsReadonly ) {
 		var nodeType = currentNode.type;
-		return nodeType == CKEDITOR.NODE_TEXT || nodeIsReadonly || ( nodeType == CKEDITOR.NODE_ELEMENT && !currentNode.getChildCount() )
+		return nodeType == CKEDITOR.NODE_TEXT || nodeIsReadonly || ( nodeType == CKEDITOR.NODE_ELEMENT && !currentNode.getChildCount() );
 	}
 
 	// Checks if position is a subset of posBitFlags and that nodeA fulfills style def rule.
@@ -1234,14 +1234,14 @@ CKEDITOR.STYLE_OBJECT = 3;
 			styles = def.styles,
 			overrides = getOverrides( this ),
 			innerElements = element.getElementsByTag( this.element ),
-			element;
+			innerElement;
 
 		for ( var i = innerElements.count(); --i >= 0; ) {
-			element = innerElements.getItem( i );
+			innerElement = innerElements.getItem( i );
 
 			// Do not remove elements which are read only (e.g. duplicates inside widgets).
-			if ( !element.isReadOnly() )
-				removeFromElement.call( this, element );
+			if ( !innerElement.isReadOnly() )
+				removeFromElement.call( this, innerElement );
 		}
 
 		// Now remove any other element with different name that is
@@ -1251,11 +1251,11 @@ CKEDITOR.STYLE_OBJECT = 3;
 				innerElements = element.getElementsByTag( overrideElement );
 
 				for ( i = innerElements.count() - 1; i >= 0; i-- ) {
-					element = innerElements.getItem( i );
+					innerElement = innerElements.getItem( i );
 
 					// Do not remove elements which are read only (e.g. duplicates inside widgets).
-					if ( !element.isReadOnly() )
-						removeOverrides( innerElement, overrides[ element ] );
+					if ( !innerElement.isReadOnly() )
+						removeOverrides( innerElement, overrides[ overrideElement ] );
 				}
 			}
 		}

diff --git a/dev/jslint/lint.conf b/dev/jslint/lint.conf
@@ -127,6 +127,8 @@
 +define frames
 +define JSON
 +define CKCONSOLE
++define Image
++define $
 
 ### Interactive
 # Prompt for a keystroke before exiting.

diff --git a/plugins/lineutils/plugin.js b/plugins/lineutils/plugin.js
@@ -172,7 +172,7 @@
 				}
 
 				merge( el, type, this.relations );
-			}
+			};
 		})(),
 
 		/**
@@ -330,7 +330,7 @@
 
 					this.traverseSearch( pos );
 				}
-			}
+			};
 		})(),
 
 		/**
@@ -511,7 +511,7 @@
 
 						// An array is empty.
 						if ( !sorted.length )
-							sorted.push( { uid: +uid, type: type, dist: dist } )
+							sorted.push( { uid: +uid, type: type, dist: dist } );
 						else {
 							// Sort the array on fly when it's populated.
 							for ( i = 0; i < sorted.length; i++ ) {
@@ -902,7 +902,7 @@
 	}
 
 	function isFloated( el ) {
-		return !!( floats[ el.getComputedStyle( 'float' ) ] || floats[ el.getAttribute( 'align' ) ] )
+		return !!( floats[ el.getComputedStyle( 'float' ) ] || floats[ el.getAttribute( 'align' ) ] );
 	}
 
 	function isPositioned( el ) {

diff --git a/plugins/magicline/plugin.js b/plugins/magicline/plugin.js
@@ -478,7 +478,7 @@
 
 				// Trigger in nested editable area.
 				if ( limit.getAttribute( 'contenteditable' ) == 'true' )
-					return trigger
+					return trigger;
 				// Trigger in non-editable area.
 				else if ( limit.is( that.triggers ) )
 					return limit;

diff --git a/samples/sample.js b/samples/sample.js
@@ -12,10 +12,11 @@
 		var editor = ev.editor,
 			meta = CKEDITOR.document.$.getElementsByName( 'ckeditor-sample-required-plugins' ),
 			requires = meta.length ? CKEDITOR.dom.element.get( meta[ 0 ] ).getAttribute( 'content' ).split( ',' ) : [],
-			missing = [];
+			missing = [],
+			i;
 
 		if ( requires.length ) {
-			for ( var i = 0; i < requires.length; i++ ) {
+			for ( i = 0; i < requires.length; i++ ) {
 				if ( !editor.plugins[ requires[ i ] ] )
 					missing.push( '<code>' + requires[ i ] + '</code>' );
 			}
@@ -34,7 +35,7 @@
 		var doc = new CKEDITOR.dom.document( document ),
 			icons = doc.find( '.button_icon' );
 
-		for ( var i = 0, count = icons.count(); i < count; i++ ) {
+		for ( i = 0; i < icons.count(); i++ ) {
 			var icon = icons.getItem( i ),
 				name = icon.getAttribute( 'data-icon' ),
 				style = CKEDITOR.skin.getIconStyle( name, ( CKEDITOR.lang.dir == 'rtl' ) );
@@ -44,7 +45,7 @@
 			icon.setAttribute( 'style', style );
 			icon.setStyle( 'float', 'none' );
 
-		};
+		}
 	} );
 })();
 // %LEAVE_UNMINIFIED% %REMOVE_LINE%