Merge branch 'master' into grid

Author: jzaefferer

README.md

@@ -14,13 +14,13 @@ When looking at pull requests, first check for [proper commit messages](http://w
 
 Unless everything is fine and you can merge directly via GitHub's interface, fetch the remote first:
 
-  git remote add [username] [his-fork.git] -f
+    git remote add [username] [his-fork.git] -f
 
 If you want just one commit and edit the commit message:
 
-  git cherry-pick -e [sha-of-commit]
+    git cherry-pick -e [sha-of-commit]
 
 If it should go to the stable brach, cherry-pick it to stable:
 
-  git checkout 1-8-stable
-  git cherry-pick -x [sha-of-commit]
+    git checkout 1-8-stable
+    git cherry-pick -x [sha-of-commit]

demos/spinner/currency.html

@@ -27,7 +27,7 @@
 			max: 2500,
 			step: 25,
 			start: 1000,
-			numberformat: "C"
+			numberFormat: "C"
 		});	
 
 	});

demos/spinner/decimal.html

@@ -18,7 +18,7 @@
 	$(function() {
 		$("#spinner").spinner({
 			step: 0.01,
-			numberformat: "n"
+			numberFormat: "n"
 		});	
 
 		$("#culture").change(function() {

tests/jquery.simulate.js

@@ -123,10 +123,10 @@ $.extend($.simulate.prototype, {
 		this.simulateEvent(target, "click", coord);
 	},
 	findCenter: function(el) {
-		var el = $(this.target), o = el.offset();
+		var el = $(this.target), o = el.offset(), d = $(document);
 		return {
-			x: o.left + el.outerWidth() / 2,
-			y: o.top + el.outerHeight() / 2
+			x: o.left + el.outerWidth() / 2 - d.scrollLeft(),
+			y: o.top + el.outerHeight() / 2 - d.scrollTop()
 		};
 	}
 });

tests/unit/spinner/spinner_defaults.js

@@ -4,7 +4,7 @@ commonWidgetTests( "spinner", {
 		incremental: true,
 		max: null,
 		min: null,
-		numberformat: null,
+		numberFormat: null,
 		page: 10,
 		step: null,
 		value: null,

tests/unit/spinner/spinner_options.js

@@ -5,26 +5,26 @@
 
 module("spinner: options");
 
-test("numberformat, number", function() {
+test("numberFormat, number", function() {
 	var el = $("#spin").spinner({
 		value: "1",
-		numberformat: "n"
+		numberFormat: "n"
 	});
 	equal(el.val(), "1.00");
 });
 
-test("numberformat, number, simple", function() {
+test("numberFormat, number, simple", function() {
 	var el = $("#spin").spinner({
 		value: "1",
-		numberformat: "n0"
+		numberFormat: "n0"
 	});
 	equal(el.val(), "1");
 });
 
-test("numberformat, currency", function() {
+test("numberFormat, currency", function() {
 	var el = $("#spin").spinner({
 		value: "1",
-		numberformat: "C"
+		numberFormat: "C"
 	});
 	equal(el.val(), "$1.00");
 });
@@ -111,7 +111,7 @@ test("step, 2", function() {
 test("step, 0.7", function() {
 	var el = $("#spin").spinner({
 		step: 0.7,
-		numberformat: "n1"
+		numberFormat: "n1"
 	});
 	equals(el.val(), "0.0", "value initialized to");
 

ui/jquery.effects.blind.js

@@ -31,7 +31,12 @@ $.effects.effect.blind = function( o ) {
 			animation = {},
 			wrapper, distance;
 
-		$.effects.save( el, props ); 
+		// if already wrapped, the wrapper's properties are my property. #6245
+		if ( el.parent().is( ".ui-effects-wrapper" ) ) {
+			$.effects.save( el.parent(), props );
+		} else {
+			$.effects.save( el, props );
+		}
 		el.show(); 
 		wrapper = $.effects.createWrapper( el ).css({ 
 			overflow: "hidden"

ui/jquery.ui.sortable.js

@@ -983,7 +983,7 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 		// We first have to update the dom position of the actual currentItem
 		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
-		if(!this._noFinalSort && this.currentItem[0].parentNode) this.placeholder.before(this.currentItem);
+		if(!this._noFinalSort && this.currentItem.parent().length) this.placeholder.before(this.currentItem);
 		this._noFinalSort = null;
 
 		if(this.helper[0] == this.currentItem[0]) {

ui/jquery.ui.spinner.js

@@ -20,7 +20,7 @@ $.widget( "ui.spinner", {
 		incremental: true,
 		max: null,
 		min: null,
-		numberformat: null,
+		numberFormat: null,
 		page: 10,
 		step: null,
 		value: null
@@ -318,13 +318,13 @@ $.widget( "ui.spinner", {
 
 	_parse: function( val ) {
 		if ( typeof val === "string" ) {
-			val = $.global && this.options.numberformat ? $.global.parseFloat( val ) : +val;
+			val = $.global && this.options.numberFormat ? $.global.parseFloat( val ) : +val;
 		}
 		return isNaN( val ) ? null : val;
 	},
 
 	_format: function( num ) {
-		this.element.val( $.global && this.options.numberformat ? $.global.format( num, this.options.numberformat ) : num );
+		this.element.val( $.global && this.options.numberFormat ? $.global.format( num, this.options.numberFormat ) : num );
 	},
 
 	destroy: function() {