diff --git a/Makefile b/Makefile index fae74f95..83a42e90 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ JQUERY = $(shell grep Library js/jquery.js | sed s'/ \* jQuery JavaScript Librar # The directory to create the zipped files in and also serves as the filenames DIR = jquery.mobile-${VER} +STRUCTUREFILE = jquery.mobile.structure-${VER} nightly: DIR = jquery.mobile # The output folder for the finished files @@ -33,8 +34,8 @@ JS = ${DIR}.js MIN = ${DIR}.min.js CSS = ${DIR}.css CSSMIN = ${DIR}.min.css -CSSSTRUCTURE = ${DIR}.structure.css -CSSSTRUCTUREMIN = ${DIR}.structure.min.css +CSSSTRUCTURE = ${STRUCTUREFILE}.css +CSSSTRUCTUREMIN = ${STRUCTUREFILE}.min.css CSSTHEME = default # The files to include when compiling the JS files diff --git a/docs/api/methods.html b/docs/api/methods.html index 86d3532b..e81b4ee0 100755 --- a/docs/api/methods.html +++ b/docs/api/methods.html @@ -191,6 +191,47 @@ $.mobile.hidePageLoadingMsg(); +
$.mobile.fixedToolbars.show (method)
+
Utility method for displaying the fixed header and/or footer of the current active page within the viewport. Note that fixed headers/footers are never really hidden. Toggling the show/hide state of a toolbar is really toggling whether or not they are inline within the page content, or displayed within the viewport as if they were fixed.
+
+
+
· Arguments
+
immediately (boolean, optional) If true, any fixed header or footer for the current active page is displayed immediately within the viewport. If false or unspecified, the fixed header/footer will fade-in after a 100 millisecond delay. Note that other events such as a document resize or scroll event can result in an additional delay before the start of the header/footer display animation.
+
+
+
Example: + 
+			
+// Show fixed header/footer with a fade animation. 			
+$.mobile.fixedToolbars.show();	
+
+// Show fixed header/footer immediately.
+$.mobile.fixedToolbars.show(true);	
+			
+
+ +
+ +
$.mobile.fixedToolbars.hide (method)
+
Utility method for hiding the fixed header and/or footer of the current active page.
+
+
+
· Arguments
+
immediately (boolean, optional) If true, any fixed header or footer for the current active page is immediately placed inline (back in flow) with the page content, which means it will scroll along with the content and will only be visible when viewing the top or bottom of the page within the viewport. If false or unspecified, the fixed header/footer will fade-out after a 100 millisecond delay. Note that other events such as a document resize or scroll event can result in the header/footer being immediately hidden.
+
+
+
Example: + 
+			
+// Hide fixed header/footer with a fade animation. 			
+$.mobile.fixedToolbars.hide();	
+
+// Hide fixed header/footer immediately.
+$.mobile.fixedToolbars.hide(true);	
+			
+
+ +
$.mobile.path.parseUrl (method)
Utility method for parsing a URL and its relative variants into an object that makes accessing the components of the URL easy. When parsing relative variants, the resulting object will contain empty string values for missing components (like protocol, host, etc). Also, when parsing URLs that have no authority, such as tel: urls, the pathname property of the object will contain the data after the protocol/scheme colon.
diff --git a/tests/unit/checkboxradio/checkboxradio_core.js b/tests/unit/checkboxradio/checkboxradio_core.js index 12deaabc..61ae2fe5 100644 --- a/tests/unit/checkboxradio/checkboxradio_core.js +++ b/tests/unit/checkboxradio/checkboxradio_core.js @@ -51,16 +51,16 @@ $checkbox.unbind( "change" ); - expect( 2 ); + expect( 1 ); - $checkbox.change(function(){ + $checkbox.one('change', function(){ ok( true, "change fired on click to check the box" ); }); $checkboxLabel.trigger( "click" ); //test above will be triggered twice, and the start here once - $checkbox.change( function(){ + $checkbox.one('change', function(){ start(); }); @@ -119,7 +119,6 @@ // not testing the positive case here since's it's obviously tested elsewhere test( "checkboxradio elements in the keepNative set shouldn't be enhanced", function() { - console.log( ); ok( !$("input.should-be-native").parent().is("div.ui-checkbox") ); }); })(jQuery);