diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js index 5660ba73..95797029 100644 --- a/js/jquery.mobile.navigation.js +++ b/js/jquery.mobile.navigation.js @@ -254,6 +254,7 @@ else{ // defer execution for consistency between webkit/non webkit setTimeout(callback, 0); + return $(this); } }; diff --git a/tests/unit/event/event_core.js b/tests/unit/event/event_core.js index 07ab00a6..919345d2 100644 --- a/tests/unit/event/event_core.js +++ b/tests/unit/event/event_core.js @@ -11,7 +11,7 @@ "swipe swipeleft swiperight scrollstart scrollstop").split( " " ); module(libName, { - teardown: function(){ + setup: function(){ // ensure bindings are removed $.each(events, function(i, name){ @@ -247,7 +247,6 @@ $($.event.special.swipe).bind('swipe', function(){ swipe = true; - start(); }); //NOTE bypass the trigger source check @@ -270,7 +269,7 @@ same(swipe, opts.expected, "swipe expected"); //NOTE the start in the event closure won't be fired, fire it here - if(!opts.expected) { start(); } + start(); }, opts.timeout + 10); stop(); diff --git a/tests/unit/listview/listview_core.js b/tests/unit/listview/listview_core.js index 6503d200..3daa5893 100644 --- a/tests/unit/listview/listview_core.js +++ b/tests/unit/listview/listview_core.js @@ -31,7 +31,7 @@ }); asyncTest( "Slides back to main page when back button is clicked", function() { - $.testHelper.openPage("#basic-linked-results"); + $.testHelper.openPage("#basic-link-results"); $('#basic-link-results a:contains("Back")').click(); setTimeout(function() { @@ -227,7 +227,7 @@ }, 500); setTimeout(function() { - same($searchPage.find('li[style^="display: none;"]').length, 0); + same($searchPage.find("li[style^='display: none;']").length, 0); start(); }, 1000); });