Grid: Finish merge from master: Upgrade to jQuery 1.7.2, fix most lint errors

jzaefferer · jzaefferer · commit fdfa535a36fd · 2012-08-09T16:36:14.000+03:00
diff --git a/grid-editing/csv-editor.html b/grid-editing/csv-editor.html
@@ -5,7 +5,7 @@
 	<title>Grid: Editing, Inline Grid</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/globalize.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../external/jquery.mousewheel-3.0.4.js"></script>
diff --git a/grid-editing/editor.js b/grid-editing/editor.js
@@ -20,7 +20,7 @@ $.widget( "ui.editor", {
 	},
 	_create: function() {
 		this.inner = this.element.wrapInner( "<div class='editor-wrapper'></div>" ).children();
-		this._bind({
+		this._on({
 			dblclick: function( event ) {
 				if ( this.input.is(":visible") ) {
 					return;
@@ -38,7 +38,7 @@ $.widget( "ui.editor", {
 		}
 		this.inputWrapper.hide().appendTo( this.element );
 
-		this._bind( this.inputWrapper, {
+		this._on( this.inputWrapper, {
 			focusin: function() {
 				clearTimeout( this.timer );
 			},
diff --git a/grid-editing/grid-editor.js b/grid-editing/grid-editor.js
@@ -21,7 +21,7 @@ $.widget( "ui.gridEditor", {
 	_create: function() {
 		var grid = this.element.data("grid");
 
-		this._bind({
+		this._on({
 			dblclick: function( event ) {
 				var that = this;
 				var target = $( event.target ).closest( this.options.items );
diff --git a/grid-editing/grid-selectable.html b/grid-editing/grid-selectable.html
@@ -5,7 +5,7 @@
 	<title>Grid: Selectable Editing</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/globalize.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../external/jquery.mousewheel-3.0.4.js"></script>
diff --git a/grid-editing/grid.html b/grid-editing/grid.html
@@ -5,11 +5,11 @@
 	<title>Grid: Editing, Inline Grid</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/globalize.js"></script>
 	<script src="../external/globalize.culture.de-DE.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
-	<script src="../external/jquery.mousewheel-3.0.4.js"></script>
+	<script src="../external/jquery.mousewheel.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
 	<script src="../ui/jquery.ui.button.js"></script>
diff --git a/grid-editing/master-detail.html b/grid-editing/master-detail.html
@@ -6,7 +6,7 @@
 	<title>Grid: Editing, Master/Detail</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../external/jquery.mousewheel-3.0.4.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
diff --git a/grid-editing/navigator.js b/grid-editing/navigator.js
@@ -10,7 +10,7 @@ $.widget( "ui.navigator", {
 	_create: function() {
 		this.active = $();
 		this.element.attr( "tabIndex", 0 );
-		this._bind({
+		this._on({
 			focusin: "activate",
 			focusout: "deactivate",
 			keydown: "move",
diff --git a/grid-editing/todo-app.html b/grid-editing/todo-app.html
@@ -6,7 +6,7 @@
 	<title>Grid: Editing, Todo app</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/autocomplete.html b/grid-spf/autocomplete.html
@@ -5,7 +5,7 @@
 	<title>Grid: Autocomplete</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/dataview-preloader-tests.html b/grid-spf/dataview-preloader-tests.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8">
 	<title>jQuery UI Preloader Dataview Tests</title>
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
 	<script src="../ui/jquery.ui.observable.js"></script>
diff --git a/grid-spf/developers-grid.html b/grid-spf/developers-grid.html
@@ -5,7 +5,7 @@
 	<title>Grid: Sorting, Paging, Filtering</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/ebay.html b/grid-spf/ebay.html
@@ -5,7 +5,7 @@
 	<title>Product Browsing</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/grid-plain.html b/grid-spf/grid-plain.html
@@ -5,7 +5,7 @@
 	<title>Grid: Featureless</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/grid.html b/grid-spf/grid.html
@@ -5,7 +5,7 @@
 	<title>Grid: Sorting, Paging, Filtering</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/movies-preloader.html b/grid-spf/movies-preloader.html
@@ -5,7 +5,7 @@
 	<title>Grid: Sorting, Paging, Filtering</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/movies.html b/grid-spf/movies.html
@@ -5,7 +5,7 @@
 	<title>Grid: Sorting, Paging, Filtering</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/pager.js b/grid-spf/pager.js
@@ -15,7 +15,7 @@ $.widget( "spf.pager", {
 	_create: function() {
 		var that = this;
 
-		this._bind( this.options.source, {
+		this._on( this.options.source, {
 			dataviewresponse: "refresh"
 		});
 
diff --git a/grid-spf/products-grid.html b/grid-spf/products-grid.html
@@ -5,7 +5,7 @@
 	<title>Grid: Sorting, Paging, Filtering</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/products-scrolling.html b/grid-spf/products-scrolling.html
@@ -5,7 +5,7 @@
 	<title>Grid: Sorting, Paging, Filtering</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/slideshow-local.html b/grid-spf/slideshow-local.html
@@ -5,7 +5,7 @@
 	<title>Photo Slideshow</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/slideshow-preloader.html b/grid-spf/slideshow-preloader.html
@@ -5,7 +5,7 @@
 	<title>Photo Slideshow</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/slideshow-remote.html b/grid-spf/slideshow-remote.html
@@ -5,7 +5,7 @@
 	<title>Photo Slideshow</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../ui/jquery.ui.core.js"></script>
 	<script src="../ui/jquery.ui.widget.js"></script>
diff --git a/grid-spf/tablesorter.html b/grid-spf/tablesorter.html
@@ -5,7 +5,7 @@
 	<title>Grid: Sorting, Paging, Filtering</title>
 	<link rel="stylesheet" href="../themes/base/jquery.ui.all.css">
 	<link rel="stylesheet" href="../demos/demos.css">
-	<script src="../jquery-1.7.1.js"></script>
+	<script src="../jquery-1.7.2.js"></script>
 	<script src="../external/jquery.tmpl.js"></script>
 	<script src="../external/globalize.js"></script>
 	<script src="../external/globalize.culture.de-DE.js"></script>
diff --git a/ui/jquery.ui.dataview.js b/ui/jquery.ui.dataview.js
@@ -66,10 +66,10 @@ $.widget( "ui.dataview", {
 		this._trigger( "request" );
 
 		var request = $.extend( {}, this.options, {
-			page: this.page()
-		});
+				page: this.page()
+			}),
+			that = this;
 
-		var that = this;
 		this.options.source( request, function( data, totalCount ) {
 			that.totalCount = parseInt(totalCount, 10);
 			$.observable( that.result ).replaceAll( data );
diff --git a/ui/jquery.ui.dataviewlocal.js b/ui/jquery.ui.dataviewlocal.js
@@ -14,7 +14,8 @@ $.widget( "ui.dataviewlocal", $.ui.dataview, {
 		input: null
 	},
 	_create: function() {
-		var that = this;
+		var properties,
+			that = this;
 		this.options.source = function( request, response) {
 			var sortedItems = that._sort( that._filter( that.options.input ) );
 			response( that._page( sortedItems ), sortedItems.length );
@@ -26,7 +27,7 @@ $.widget( "ui.dataviewlocal", $.ui.dataview, {
 		}
 		this.properties = {};
 		if ( this.options.properties ) {
-			var properties = this.properties;
+			properties = this.properties;
 			$.each( this.options.properties, function( index, definition ) {
 				properties[ definition.property ] = definition;
 			});
@@ -39,12 +40,12 @@ $.widget( "ui.dataviewlocal", $.ui.dataview, {
 				var property,
 					filter,
 					match = true;
-	            for ( property in that.options.filter ) {
+				for ( property in that.options.filter ) {
 					filter = that.options.filter[ property ];
 					match &= that._match( item[ property ], filter, property );
 				}
 				return match;
-	        });
+			});
 		}
 		return items;
 	},
@@ -53,15 +54,15 @@ $.widget( "ui.dataviewlocal", $.ui.dataview, {
 			operator = filter.operator || (typeof operand === "string" ? "like" : "==");
 		value = this._extract( value, property );
 		switch (operator) {
-            case "==": return value == operand;
-            case "!=": return value != operand;
-            case "<": return value < operand;
-            case "<=": return value <= operand;
-            case ">": return value > operand;
-            case ">=": return value >= operand;
-			case "like": return new RegExp( operand.replace( /[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&" ), "i" ).test( value );
-            default: throw "Unrecognized filter operator: " + operator + " for operand " + operand;
-        }
+			case "==": return value == operand;
+			case "!=": return value != operand;
+			case "<": return value < operand;
+			case "<=": return value <= operand;
+			case ">": return value > operand;
+			case ">=": return value >= operand;
+			case "like": return new RegExp( operand.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ), "i" ).test( value );
+			default: throw "Unrecognized filter operator: " + operator + " for operand " + operand;
+		}
 	},
 	_extract: function( text, propertyName ) {
 		var property = this.properties[ propertyName ];
@@ -77,34 +78,36 @@ $.widget( "ui.dataviewlocal", $.ui.dataview, {
 		}
 	},
 	_sort: function( items ) {
-		var that = this;
+		var sorts, first,
+			that = this;
 		function sorter( property, secondary ) {
 			var order = 1;
 			if (property.charAt( 0 ) === "-") {
 				order = -1;
 				property = property.slice( 1 );
 			}
 			return function ( item1, item2 ) {
-                var value1 = item1[ property ],
-                    value2 = item2[ property ];
-                if ( value1 === value2 ) {
+				var next,
+					value1 = item1[ property ],
+					value2 = item2[ property ];
+				if ( value1 === value2 ) {
 					if ( secondary.length ) {
-						var next = secondary[ 0 ];
+						next = secondary[ 0 ];
 						return sorter( next, secondary.slice( 1 ) )( item1, item2 );
 					}
 					return 0;
 				}
 				return order * ( that._extract( value1, property ) > that._extract( value2, property ) ? 1 : -1 );
-            };
+			};
 		}
 		if ( this.options.sort.length ) {
 			// if unfiltered, make a copy to not sort the input
 			if ( items === this.options.input ) {
 				items = items.slice( 0 );
 			}
-			var sorts = this.options.sort;
-			var first = sorts[ 0 ];
-        	return items.sort( sorter( first, sorts.slice( 1 ) ) );
+			sorts = this.options.sort;
+			first = sorts[ 0 ];
+			return items.sort( sorter( first, sorts.slice( 1 ) ) );
 		}
 		return items;
 	},
diff --git a/ui/jquery.ui.grid.js b/ui/jquery.ui.grid.js
diff --git a/ui/jquery.ui.observable.js b/ui/jquery.ui.observable.js
