Release: fix revert artefacts

diff --git a/src/core.js b/src/core.js
index d3c08c636adced8f709374ec99555f37a613351a..ab172bb4fc93ac2bd0d7d0a746a81c379cdb8fea 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -269,16 +269,19 @@ jQuery.extend( {
                code = jQuery.trim( code );
 
                if ( code ) {
+
                        // If the code includes a valid, prologue position
                        // strict mode pragma, execute code by injecting a
                        // script tag into the document.
-                       if ( code.indexOf("use strict") === 1 ) {
-                               script = document.createElement("script");
+                       if ( code.indexOf( "use strict" ) === 1 ) {
+                               script = document.createElement( "script" );
                                script.text = code;
                                document.head.appendChild( script ).parentNode.removeChild( script );
                        } else {
-                       // Otherwise, avoid the DOM node creation, insertion
-                       // and removal by using an indirect global eval
+
+                               // Otherwise, avoid the DOM node creation, insertion
+                               // and removal by using an indirect global eval
+
                                indirect( code );
                        }
                }

diff --git a/src/css.js b/src/css.js
index 7f085560e999dd6eedcfacbb41570cf0957374ae..7bff81440a41ea53df57a851c8f34c50c976ff99 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -415,6 +415,19 @@ jQuery.each( [ "height", "width" ], function( i, name ) {
        };
 } );
 
+jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
+       function( elem, computed ) {
+               if ( computed ) {
+                       return ( parseFloat( curCSS( elem, "marginLeft" ) ) ||
+                               elem.getBoundingClientRect().left -
+                                       swap( elem, { marginLeft: 0 }, function() {
+                                               return elem.getBoundingClientRect().left;
+                                       } )
+                               ) + "px";
+               }
+       }
+);
+
 // These hooks are used by animate to expand properties
 jQuery.each( {
        margin: "",

diff --git a/src/effects.js b/src/effects.js
index d8997f4be98b82bfe76f3771040a112f6ee45b88..178fa42f0673f610aadcfdfcc0f0028e4c16b220 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -401,8 +401,9 @@ jQuery.speed = function( speed, easing, fn ) {
                easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
        };
 
-       opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-               opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+       opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ?
+               opt.duration : opt.duration in jQuery.fx.speeds ?
+                       jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
 
        // Normalize opt.queue - true/undefined/null -> "fx"
        if ( opt.queue == null || opt.queue === true ) {

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 3d3bfb9aa80558268689f7f4691f7d269c3a62fe..69eae32112a0d68cfb0cd79e768a775b26e4f84f 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1628,10 +1628,10 @@ if ( typeof window.ArrayBuffer === "undefined" || typeof new XMLHttpRequest().re
                        // Global events get confused by the exception
                        global: false,
                        success: function() {
-                               ok( false, "Success." );
+                               assert.ok( false, "Success." );
                        },
                        error: function() {
-                               ok( false, "Error." );
+                               assert.ok( false, "Error." );
                        }
                });
        });

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 050853bf5e97dc2ab396409a4349ef79c929348f..e5c65e32aee8ecfbdd90c7c4899719892cf83ea8 100644 (file)
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -2297,7 +2297,7 @@ QUnit.test( "html() - script exceptions bubble (#11743)", function( assert ) {
        if ( jQuery.ajax ) {
                var onerror = window.onerror;
                window.onerror = function() {
-                       ok( true, "Exception thrown in remote script" );
+                       assert.ok( true, "Exception thrown in remote script" );
                };
 
                jQuery("#qunit-fixture").html("<script src='data/badcall.js'></script>");