This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/external/qunit.js b/external/qunit.js | |
index 193d52d..79e320b 100644 | |
--- a/external/qunit.js | |
+++ b/external/qunit.js | |
@@ -1549,4 +1549,8 @@ QUnit.diff = (function() { | |
}; | |
})(); | |
+// Add a two second delay to allow for phantomjs | |
+// to inject its qunit callbacks |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/js/widgets/dialog.js b/js/widgets/dialog.js | |
index ec8f825..d2a0e77 100644 | |
--- a/js/widgets/dialog.js | |
+++ b/js/widgets/dialog.js | |
@@ -67,8 +67,10 @@ $.widget( "mobile.dialog", $.mobile.widget, { | |
.attr( "data-" + $.mobile.ns + "direction", "reverse" ); | |
} | |
}) | |
- .bind( "pagehide", function( e, ui ) { | |
+ .bind( "pagebeforeshow", function( e ) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Script started on Thu 09 Aug 2012 12:15:56 AM EEST | |
[nix@grinder jquery-mobile]$ JUNIT_OUTPUT=build/test-results/ ROOT_DOMAIN=http://localhost/nix/jqm/jquery-mobile/tests/unit node_modules/.bin/grunt test | |
Running "config:test:pages" task | |
tests/unit/kitchensink/ | |
tests/unit/loader/ | |
tests/unit/checkboxradio/ | |
tests/unit/dialog/ | |
tests/unit/page/ | |
tests/unit/button-markup/ | |
tests/unit/zoom/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#popup is open | |
event type: vmouseover tag: DIV class: ui-popup-screen fade | |
event type: vmousedown tag: DIV class: ui-popup-screen fade | |
event type: vmouseup tag: DIV class: ui-popup-screen fade | |
event type: vclick tag: DIV class: ui-popup-screen fade | |
_eatEventAndClose: Entering | |
_eatEventAndClose: Exiting | |
event type: vmouseout tag: DIV class: ui-popup-screen fade | |
event type: navigate tag: BODY class: ui-mobile-viewport ui-overlay-c | |
event type: popupafterclose tag: DIV class: ui-popup ui-overlay-shadow ui-corner-all ui-body-c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js | |
index ae18def..a116012 100644 | |
--- a/js/jquery.mobile.navigation.js | |
+++ b/js/jquery.mobile.navigation.js | |
@@ -1243,7 +1243,7 @@ define( [ | |
//The following event bindings should be bound after mobileinit has been triggered | |
//the following deferred is resolved in the init file | |
$.mobile.navreadyDeferred = $.Deferred(); | |
- $.mobile.navreadyDeferred.done(function() { | |
+ $.mobile._registerInternalEvents = function() { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js | |
index ae18def..b561cf9 100644 | |
--- a/js/jquery.mobile.navigation.js | |
+++ b/js/jquery.mobile.navigation.js | |
@@ -1243,7 +1243,7 @@ define( [ | |
//The following event bindings should be bound after mobileinit has been triggered | |
//the following deferred is resolved in the init file | |
$.mobile.navreadyDeferred = $.Deferred(); | |
- $.mobile.navreadyDeferred.done(function() { | |
+ $.mobile._registerInternalEvents = function() { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js | |
index 2a27957..f8507c2 100644 | |
--- a/js/jquery.mobile.navigation.js | |
+++ b/js/jquery.mobile.navigation.js | |
@@ -252,13 +252,17 @@ define( [ | |
return ( /^(:?\w+:)/ ).test( url ); | |
}, | |
+ _samePath: function( u ) { | |
+ return u.hrefNoSearch === documentUrl.hrefNoSearch || ( documentBaseDiffers && u.hrefNoSearch === documentBase.hrefNoSearch ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/docs/_assets/js/jqm-docs.js b/docs/_assets/js/jqm-docs.js | |
index 91474cc..4589711 100644 | |
--- a/docs/_assets/js/jqm-docs.js | |
+++ b/docs/_assets/js/jqm-docs.js | |
@@ -73,3 +73,25 @@ if ( location.protocol.substr(0,4) === 'file' || | |
}); | |
}); | |
} | |
+ | |
+// Measure the time that passes from pageload until pageshow |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
css/structure/jquery.mobile.button.css | 7 ++ | |
css/structure/jquery.mobile.collapsible.css | 30 ++++++ | |
css/structure/jquery.mobile.controlgroup.css | 85 ++++++++++++++++- | |
css/structure/jquery.mobile.core.css | 20 ++++- | |
css/structure/jquery.mobile.listview.css | 52 +++++++++-- | |
css/structure/jquery.mobile.popup.css | 40 -------- | |
css/themes/default/jquery.mobile.theme.css | 128 -------------------------- | |
js/jquery.mobile.buttonMarkup.js | 38 +------- | |
js/widgets/collapsible.js | 27 +++--- | |
js/widgets/collapsibleSet.js | 59 ++++-------- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
css-corner-styling: | |
drwxr-xr-x. 2 nix nix 4096 Nov 8 20:25 images | |
-rw-rw-r--. 1 nix nix 109771 Nov 8 20:25 jquery.mobile.css | |
-rw-rw-r--. 1 nix nix 298971 Nov 8 20:25 jquery.mobile.js | |
-rw-rw-r--. 1 nix nix 74563 Nov 8 20:25 jquery.mobile.min.css | |
-rw-rw-r--. 1 nix nix 115657 Nov 8 20:25 jquery.mobile.min.js | |
-rw-rw-r--. 1 nix nix 58394 Nov 8 20:25 jquery.mobile.structure.css | |
-rw-rw-r--. 1 nix nix 52062 Nov 8 20:25 jquery.mobile.structure.min.css | |
-rw-rw-r--. 1 nix nix 47691 Nov 8 20:25 jquery.mobile.theme.css |
OlderNewer