Index: /CKEditor/trunk/_samples/output_html.html
===================================================================
--- /CKEditor/trunk/_samples/output_html.html	(revision 5527)
+++ /CKEditor/trunk/_samples/output_html.html	(revision 5528)
@@ -187,11 +187,11 @@
 					if ( element.name == 'p' )
 					{
-						var style = element.attributes.style;
+						style = element.attributes.style;
 
 						if ( style )
 						{
 							// Get the align from the style.
-							var match = /(?:^|\s)text-align\s*:\s*(\w*);/i.exec( style ),
-								align = match && match[1];
+							match = /(?:^|\s)text-align\s*:\s*(\w*);/i.exec( style );
+							var align = match && match[1];
 
 							if ( align )
@@ -203,5 +203,5 @@
 					}
 
-					if ( element.attributes.style == '' )
+					if ( !element.attributes.style )
 						delete element.attributes.style;
 
Index: /CKEditor/trunk/_source/core/dom/element.js
===================================================================
--- /CKEditor/trunk/_source/core/dom/element.js	(revision 5527)
+++ /CKEditor/trunk/_source/core/dom/element.js	(revision 5528)
@@ -940,12 +940,12 @@
 
 			return function()
-			{
-				// Merge empty links and anchors also. (#5567)
-				if ( !( CKEDITOR.dtd.$removeEmpty[ this.getName() ] || this.is( 'a' ) ) )
-					return;
-
-				mergeElements( this, this.getNext(), true );
-				mergeElements( this, this.getPrevious() );
-			}
+				{
+					// Merge empty links and anchors also. (#5567)
+					if ( !( CKEDITOR.dtd.$removeEmpty[ this.getName() ] || this.is( 'a' ) ) )
+						return;
+
+					mergeElements( this, this.getNext(), true );
+					mergeElements( this, this.getPrevious() );
+				};
 		} )(),
 
Index: /CKEditor/trunk/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/dialog/plugin.js	(revision 5527)
+++ /CKEditor/trunk/_source/plugins/dialog/plugin.js	(revision 5528)
@@ -1870,5 +1870,5 @@
 			scrollFunc();
 		}
-	};
+	}
 
 	function hideCover()
@@ -1890,5 +1890,5 @@
 		}
 		resizeCover = null;
-	};
+	}
 	
 	function removeCovers()
@@ -2804,5 +2804,5 @@
 		{
 			var currentTopDialog;
-			while ( currentTopDialog = CKEDITOR.dialog._.currentTop )
+			while ( ( currentTopDialog = CKEDITOR.dialog._.currentTop ) )
 				currentTopDialog.hide();
 			removeCovers();
Index: /CKEditor/trunk/_source/plugins/image/dialogs/image.js
===================================================================
--- /CKEditor/trunk/_source/plugins/image/dialogs/image.js	(revision 5527)
+++ /CKEditor/trunk/_source/plugins/image/dialogs/image.js	(revision 5528)
@@ -120,5 +120,5 @@
 			// Dialog may already closed. (#5505)
 			if( !oImageOriginal )
-				return;
+				return null;
 
 			var ratioButton = CKEDITOR.document.getById( btnLockSizesId );
Index: /CKEditor/trunk/_source/plugins/liststyle/dialogs/liststyle.js
===================================================================
--- /CKEditor/trunk/_source/plugins/liststyle/dialogs/liststyle.js	(revision 5527)
+++ /CKEditor/trunk/_source/plugins/liststyle/dialogs/liststyle.js	(revision 5528)
@@ -64,5 +64,5 @@
 								{
 									var value = this.getValue();
-									if ( value != '' )
+									if ( value )
 										element.setStyle( 'list-style-type', value );
 									else 
@@ -87,5 +87,5 @@
 					element && this.commitContent( element );
 				}
-			}
+			};
 		}
 		else if ( startupPage == 'numberedListStyle'  )
@@ -149,5 +149,5 @@
 										{
 											var value = this.getValue();
-											if ( value != '' ) 
+											if ( value ) 
 												element.setStyle( 'list-style-type', value );
 											else 
@@ -174,7 +174,7 @@
 					element && this.commitContent( element );
 				}
-			}
+			};
 		}
-	};
+	}
 	
 	CKEDITOR.dialog.add( 'numberedListStyle', function( editor )
Index: /CKEditor/trunk/_source/plugins/liststyle/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/liststyle/plugin.js	(revision 5527)
+++ /CKEditor/trunk/_source/plugins/liststyle/plugin.js	(revision 5528)
@@ -46,14 +46,12 @@
 							return null;
 						
-						if ( element.getAscendant( 'ol') ) {
-							return { numberedlist: CKEDITOR.TRISTATE_OFF }
-						}
-						if ( element.getAscendant( 'ul' ) ) {
-							return { bulletedlist: CKEDITOR.TRISTATE_OFF }
-						}
-					} );
+						if ( element.getAscendant( 'ol') )
+							return { numberedlist: CKEDITOR.TRISTATE_OFF };
+
+						if ( element.getAscendant( 'ul' ) )
+							return { bulletedlist: CKEDITOR.TRISTATE_OFF };
+					});
 			}
 		}
-
 	};
 	
Index: /CKEditor/trunk/_source/plugins/maximize/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/maximize/plugin.js	(revision 5527)
+++ /CKEditor/trunk/_source/plugins/maximize/plugin.js	(revision 5528)
@@ -95,5 +95,5 @@
 	{
 		if ( !CKEDITOR.env.ie || CKEDITOR.env.version > 6 )
-			return;
+			return null;
 
 		var shim = CKEDITOR.dom.element.createFromHtml( '<iframe frameborder="0" tabindex="-1"' +
@@ -133,5 +133,5 @@
 				shim && shim.setStyles( { width : viewPaneSize.width + 'px', height : viewPaneSize.height + 'px' } );
 				editor.resize( viewPaneSize.width, viewPaneSize.height, null, true );
-			};
+			}
 
 			// Retain state after mode switches.
Index: /CKEditor/trunk/_source/plugins/resize/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/resize/plugin.js	(revision 5527)
+++ /CKEditor/trunk/_source/plugins/resize/plugin.js	(revision 5528)
@@ -136,5 +136,6 @@
 
 /**
- * The directions where resizing is enabled. It can be 'both', 'vertical' or 'horizontal'
+ * The directions to which the editor resizing is enabled. Possible values
+ * are "both", "vertical" and "horizontal".
  * @type String
  * @default 'both'
@@ -143,4 +144,3 @@
  * config.resize_dir = 'vertical';
  */
-
 CKEDITOR.config.resize_dir = 'both';
Index: /CKEditor/trunk/_source/plugins/scayt/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/scayt/plugin.js	(revision 5527)
+++ /CKEditor/trunk/_source/plugins/scayt/plugin.js	(revision 5528)
@@ -147,5 +147,5 @@
 				// Catch on source mode switch off (#5720)
 				else if ( ev.data.name == 'source'  && editor.mode == 'source' )
-					plugin.markControlRestore( editor )
+					plugin.markControlRestore( editor );
 			});
 
@@ -278,5 +278,5 @@
 				otherImage.contents = otherContents;
 				return retval;
-			}
+			};
 		});
 		
@@ -324,5 +324,5 @@
 					this.controlInfo[ editor.name ].id )
 			{
-				return this.controlInfo[ editor.name ].id
+				return this.controlInfo[ editor.name ].id;
 			}
 			return null;
@@ -494,6 +494,8 @@
 
 			if ( items_order && items_order.length )
+			{
 				for ( var pos in items_order )
-					items_order_str += 'scayt_' + items_order[ pos ] + ( items_order.length != parseInt( pos ) + 1 ? ',' : '' );
+					items_order_str += 'scayt_' + items_order[ pos ] + ( items_order.length != parseInt( pos, 10 ) + 1 ? ',' : '' );
+			}
 
 			// Register scayt rbc menu group.
@@ -762,5 +764,5 @@
 						command.setState( plugin.isScaytEnabled( editor ) ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );
 					else
-						command.setState( CKEDITOR.TRISTATE_DISABLED )
+						command.setState( CKEDITOR.TRISTATE_DISABLED );
 				};
 
Index: /CKEditor/trunk/_source/plugins/tabletools/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/tabletools/plugin.js	(revision 5527)
+++ /CKEditor/trunk/_source/plugins/tabletools/plugin.js	(revision 5528)
@@ -307,5 +307,5 @@
 			var table = selectionOrCell.getAscendant( 'table' );
 			if ( !table )
-				return;
+				return null;
 
 			// Get the cell index.
@@ -333,4 +333,6 @@
 			}
 		}
+		
+		return null;
 	}
 
Index: /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js	(revision 5527)
+++ /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js	(revision 5528)
@@ -577,5 +577,5 @@
 							},
 							0 );
-					};
+					}
 
 					editor.addMode( 'wysiwyg',