diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js index 64c7dc2f..f2ef1202 100644 --- a/js/jquery.mobile.core.js +++ b/js/jquery.mobile.core.js @@ -2,7 +2,7 @@ * "core" - The base file for jQm */ -define( [ "jquery", "jquery.mobile.support" ], function( $, undefined ) { +define( [ "jquery" ], function( $, undefined ) { var nsNormalizeDict = {}; diff --git a/js/jquery.mobile.event.js b/js/jquery.mobile.event.js index 8db94856..a0f7d800 100644 --- a/js/jquery.mobile.event.js +++ b/js/jquery.mobile.event.js @@ -2,7 +2,7 @@ * "events" plugin - Handles events */ -define( [ "jquery", "jquery.mobile.vmouse" ], function( $, undefined ) { +define( [ "jquery", "jquery.mobile.support", "jquery.mobile.vmouse" ], function( $, undefined ) { // add new event shortcuts $.each( ( "touchstart touchmove touchend orientationchange throttledresize " + diff --git a/js/jquery.mobile.media.js b/js/jquery.mobile.media.js index f37a9ad2..98c6683c 100644 --- a/js/jquery.mobile.media.js +++ b/js/jquery.mobile.media.js @@ -2,7 +2,7 @@ * a workaround for window.matchMedia */ -define( [ "jquery", "jquery.mobile.core", "jquery.mobile.support" ], function( $, undefined ) { +define( [ "jquery", "jquery.mobile.core" ], function( $, undefined ) { var $window = $( window ), $html = $( "html" ); @@ -42,8 +42,4 @@ $.mobile.media = (function() { }; })(); -$.extend( $.support, { - mediaquery: $.mobile.media( "only all" ) -}) - }); diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js index 9b0a3104..8c85266e 100755 --- a/js/jquery.mobile.navigation.js +++ b/js/jquery.mobile.navigation.js @@ -2,7 +2,7 @@ * core utilities for auto ajax navigation, base tag mgmt, */ -define( [ "jquery", "jquery.mobile.core" ], function( $, undefined ) { +define( [ "jquery", "jquery.mobile.core", "jquery.mobile.hashchange", "jquery.mobile.event" ], function( $, undefined ) { //define vars for interal use var $window = $( window ), diff --git a/js/jquery.mobile.support.js b/js/jquery.mobile.support.js index e68aec03..4de8203b 100644 --- a/js/jquery.mobile.support.js +++ b/js/jquery.mobile.support.js @@ -2,7 +2,7 @@ * support tests */ -define( [ "jquery", "jquery.mobile.core" ], function( $, undefined ) { +define( [ "jquery", "jquery.mobile.media" ], function( $, undefined ) { var fakeBody = $( "" ).prependTo( "html" ), fbCSS = fakeBody[ 0 ].style, @@ -50,7 +50,7 @@ function baseTagTest() { // non-UA-based IE version check by James Padolsey, modified by jdalton - from http://gist.github.com/527683 // allows for inclusion of IE 6+, including Windows Mobile 7 -$.mobile.browser = {}; +$.extend( $.mobile, { browser: {} } ); $.mobile.browser.ie = (function() { var v = 3, div = document.createElement( "div" ), @@ -67,6 +67,7 @@ $.extend( $.support, { touch: "ontouchend" in document, cssTransitions: "WebKitTransitionEvent" in window, pushState: "pushState" in history && "replaceState" in history, + mediaquery: $.mobile.media( "only all" ), cssPseudoElement: !!propExists( "content" ), touchOverflow: !!propExists( "overflowScrolling" ), boxShadow: !!propExists( "boxShadow" ) && !bb,