Merge remote branch 'brado23/grid-clean' into grid

Author: jzaefferer

ui/jquery.ui.dataview.js

@@ -61,20 +61,26 @@ $.widget( "ui.dataview", {
 		return Math.ceil( this.totalCount / this.options.paging.limit );
 	},
 
-	refresh: function( callback ) {
-		if ( callback ) {
-			this.element.one( "dataviewresponse", callback );
-		}
+	// TODO need reasonable signatures/names for callback and error.
+	refresh: function( callback, error ) {
 		this._trigger( "request" );
 
 		var request = $.extend( {}, this.options, {
 			page: this.page()
 		});
+
 		var that = this;
 		this.options.source( request, function( data, totalCount ) {
 			that.totalCount = parseInt(totalCount, 10);
 			$.observable( that.result ).replaceAll( data );
 			that._trigger( "response" );
+			if (callback) {
+				callback.apply(that, arguments);
+			}
+		}, function () {
+			if (error) {
+				error.apply(that, arguments);
+			}
 		});
         return this;
 	}

ui/jquery.ui.grid.js

@@ -227,7 +227,9 @@ $.widget( "ui.grid", {
 		var that = this;
 		this._container().children().each(function() {
 			if ( $( this ).data( "grid-item" ) === item ) {
-				$( this ).replaceWith( that._newRow(item) );
+				// Don't replace here.  Clients may be storing state relative to the element and 
+				// will be surprised if the element is replaced due to, for instance, a property change.
+				$( this ).html( that._newRow( item ) );
 			}
 		});
 		this._trigger( "refresh" );

ui/jquery.ui.observable.js

@@ -3,16 +3,16 @@
  *
  */
 (function ( $, undefined ) {
-	$.observable = function( data, parent ) {
-		return new observable( data, parent );
+	$.observable = function ( data ) {
+		return new observable( data );
 	};
 
 	var splice = [].splice;
 
-	function observable( data, parent ) {
+	var observable = $.observable.Observable = function ( data ) {
 		this.data = data;
-		this.parent = parent;
 	}
+
 	observable.prototype = {
 		data: null,
 
@@ -46,36 +46,40 @@
 						changed = true;
 						oldValues[ key ] = oldValue;
 						newValues[ key ] = path[ key ];
-						this._set( key, path[ key ] );
 					}
 				}
 				if ( changed ) {
-					this._trigger( "change", {
-						oldValues: oldValues,
-						newValues: newValues
-					});
+					return this._property( oldValues, newValues );
 				}
 			} else if (arguments.length == 1) {
 				return this._get( path );
 			} else {
 				var oldValue = this._get( path );
 				// TODO should be strict? currently helpers are unaware of data types, don't do parsing, therefore strict comparison wouldn't be good
 				if ( oldValue != value ) {
-					this._set( path, value );
 					var oldValues = {};
 					oldValues[ path ] = oldValue;
 					var newValues = {};
 					newValues[ path ] = value;
-					this._trigger( "change", {
-						oldValues: oldValues,
-						newValues: newValues
-					});
+					return this._property( oldValues, newValues );
 				}
 
 			}
 			return this;
 		},
 
+		_property: function( oldValues, newValues ) {
+			var that = this;
+			$.each( newValues, function( path, value ) {
+				that._set( path, value );
+			} );
+
+			return this._trigger( "change", {
+				oldValues: oldValues,
+				newValues: newValues
+			} );
+		},
+
 		insert: function( index, items) {
 			// insert( object )
 			if ( $.type(index) === "object" ) {
@@ -85,6 +89,11 @@
 			} else if ( !$.isArray( items ) ) {
 				items = [ items ];
 			}
+
+			return this._insert( index, items );
+		},
+
+		_insert: function( index, items ) {
 			// insert( index, objects )
 			splice.apply( this.data, [ index, 0 ].concat( items ) );
 			return this._trigger( "insert", {
@@ -135,6 +144,11 @@
 			if ( !numToRemove ) {
 				numToRemove = 1;
 			}
+
+			return this._remove( index, numToRemove );
+		},
+
+		_remove: function( index, numToRemove ) {
 			var items = this.data.slice( index, index + numToRemove );
 			this.data.splice( index, numToRemove );
 			// TODO update event data, along with support for removing array of objects