diff --git a/js/jquery.mobile.forms.slider.js b/js/jquery.mobile.forms.slider.js index 239b8462..830afadc 100644 --- a/js/jquery.mobile.forms.slider.js +++ b/js/jquery.mobile.forms.slider.js @@ -2,7 +2,7 @@ * "slider" plugin */ //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); -define( [ "jquery.mobile.core", "jquery.mobile.widget", "jquery.mobile.forms.textInput" ], function() { +define( [ "jquery.mobile.core", "jquery.mobile.widget", "jquery.mobile.forms.textinput" ], function() { //>>excludeEnd("jqmBuildExclude"); ( function( $, undefined ) { diff --git a/js/jquery.mobile.init.js b/js/jquery.mobile.init.js index a96d2afe..6bb16370 100644 --- a/js/jquery.mobile.init.js +++ b/js/jquery.mobile.init.js @@ -3,7 +3,7 @@ */ //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude); -define( [ "jquery.mobile.core", "jquery.mobile.navigation", "jquery.mobile.navigation.pushState" ], function() { +define( [ "jquery.mobile.core", "jquery.mobile.navigation", "jquery.mobile.navigation.pushstate" ], function() { //>>excludeEnd("jqmBuildExclude"); ( function( $, window, undefined ) { var $html = $( "html" ), @@ -101,12 +101,12 @@ define( [ "jquery.mobile.core", "jquery.mobile.navigation", "jquery.mobile.navig } } }); - + // This function injects a meta viewport tag to prevent scaling. Off by default, on by default when touchOverflow scrolling is enabled function disableZoom() { var cont = "user-scalable=no", meta = $( "meta[name='viewport']" ); - + if( meta.length ){ meta.attr( "content", meta.attr( "content" ) + ", " + cont ); } @@ -114,7 +114,7 @@ define( [ "jquery.mobile.core", "jquery.mobile.navigation", "jquery.mobile.navig $( "head" ).prepend( "", { "name": "viewport", "content": cont } ); } } - + // if touch-overflow is enabled, disable user scaling, as it creates usability issues if( $.support.touchOverflow && $.mobile.touchOverflowEnabled && !$.mobile.touchOverflowZoomEnabled ){ disableZoom(); diff --git a/js/jquery.mobile.js b/js/jquery.mobile.js index 8c9dcffb..784780ac 100644 --- a/js/jquery.mobile.js +++ b/js/jquery.mobile.js @@ -10,7 +10,7 @@ define([ 'jquery.mobile.page', 'jquery.mobile.core', 'jquery.mobile.navigation', - 'jquery.mobile.navigation.pushState', + 'jquery.mobile.navigation.pushstate', 'jquery.mobile.transition', 'jquery.mobile.degradeInputs', 'jquery.mobile.dialog', @@ -26,7 +26,7 @@ define([ 'jquery.mobile.forms.checkboxradio', 'jquery.mobile.forms.button', 'jquery.mobile.forms.slider', - 'jquery.mobile.forms.textInput', + 'jquery.mobile.forms.textinput', 'jquery.mobile.forms.select.custom', 'jquery.mobile.forms.select', 'order!jquery.mobile.buttonMarkup',