From 891f9b1b07ce13922619266054ce54cb791319d4 Mon Sep 17 00:00:00 2001 From: John Bender Date: Sat, 12 Feb 2011 23:13:49 -0800 Subject: [PATCH 1/7] moved initialization down in the build order, still requires some small refactoring --- Makefile | 3 +- build.xml | 3 +- js/index.php | 3 +- js/jquery.mobile.core.js | 50 -------------------------------- js/jquery.mobile.init.js | 62 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 68 insertions(+), 53 deletions(-) create mode 100644 js/jquery.mobile.init.js diff --git a/Makefile b/Makefile index 8664353a..c90e9cba 100755 --- a/Makefile +++ b/Makefile @@ -31,7 +31,8 @@ FILES = js/jquery.ui.widget.js \ js/jquery.mobile.listview.filter.js \ js/jquery.mobile.dialog.js \ js/jquery.mobile.navbar.js \ - js/jquery.mobile.grid.js + js/jquery.mobile.grid.js \ + js/jquery.mobile.init.js CSSFILES = themes/default/jquery.mobile.theme.css \ themes/default/jquery.mobile.core.css \ diff --git a/build.xml b/build.xml index 6a8d739d..1779bb56 100644 --- a/build.xml +++ b/build.xml @@ -43,7 +43,8 @@ jquery.mobile.grid.js, jquery.mobile.listview.js, jquery.mobile.listview.filter.js, - jquery.mobile.navbar.js" + jquery.mobile.navbar.js, + jquery.mobile.init.js" /> diff --git a/js/index.php b/js/index.php index d37f355a..89b77b3b 100644 --- a/js/index.php +++ b/js/index.php @@ -24,7 +24,8 @@ $elements = array( 'jquery.mobile.listview.filter.js', 'jquery.mobile.dialog.js', 'jquery.mobile.navbar.js', - 'jquery.mobile.grid.js' + 'jquery.mobile.grid.js', + 'jquery.mobile.init.js' ); include('../combine.php'); diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js index d233a05f..00993d17 100644 --- a/js/jquery.mobile.core.js +++ b/js/jquery.mobile.core.js @@ -8,7 +8,6 @@ */ (function( $, window, undefined ) { - //jQuery.mobile configurable options $.extend( $.mobile, { @@ -93,19 +92,6 @@ } }); - - //trigger mobileinit event - useful hook for configuring $.mobile settings before they're used - $( window.document ).trigger( "mobileinit" ); - - - //support conditions - //if device support condition(s) aren't met, leave things as they are -> a basic, usable experience, - //otherwise, proceed with the enhancements - if ( !$.mobile.gradeA() ) { - return; - } - - //define vars for interal use var $window = $(window), $html = $( "html" ), @@ -167,42 +153,6 @@ setTimeout(function() { $.event.special.scrollstart.enabled = true; }, 150 ); - }, - - // find and enhance the pages in the dom and transition to the first page. - initializePage: function(){ - //find present pages - var $pages = $( "[data-role='page']" ); - - //add dialogs, set data-url attrs - $pages.add( "[data-role='dialog']" ).each(function(){ - $(this).attr( "data-url", $(this).attr( "id" )); - }); - - //define first page in dom case one backs out to the directory root (not always the first page visited, but defined as fallback) - $.mobile.firstPage = $pages.first(); - - //define page container - $.mobile.pageContainer = $pages.first().parent().addClass( "ui-mobile-viewport" ); - - //cue page loading message - $.mobile.pageLoading(); - - // if hashchange listening is disabled or there's no hash deeplink, change to the first page in the DOM - if( !$.mobile.hashListeningEnabled || !$.mobile.path.stripHash( location.hash ) ){ - $.mobile.changePage( $.mobile.firstPage, false, true, false, true ); - } - // otherwise, trigger a hashchange to load a deeplink - else { - $window.trigger( "hashchange", [ true ] ); - } } }); - - //dom-ready inits - $($.mobile.initializePage); - - //window load event - //hide iOS browser chrome on load - $window.load( $.mobile.silentScroll ); })( jQuery, this ); diff --git a/js/jquery.mobile.init.js b/js/jquery.mobile.init.js new file mode 100644 index 00000000..700a74d0 --- /dev/null +++ b/js/jquery.mobile.init.js @@ -0,0 +1,62 @@ +/*! + * jQuery Mobile v@VERSION + * http://jquerymobile.com/ + * + * Copyright 2010, jQuery Project + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + */ + +(function( $, window, undefined ) { + $.extend($.mobile, { + // find and enhance the pages in the dom and transition to the first page. + initializePage: function(){ + //find present pages + var $pages = $( "[data-role='page']" ); + + //add dialogs, set data-url attrs + $pages.add( "[data-role='dialog']" ).each(function(){ + $(this).attr( "data-url", $(this).attr( "id" )); + }); + + //define first page in dom case one backs out to the directory root (not always the first page visited, but defined as fallback) + $.mobile.firstPage = $pages.first(); + + //define page container + $.mobile.pageContainer = $pages.first().parent().addClass( "ui-mobile-viewport" ); + + //cue page loading message + $.mobile.pageLoading(); + + // if hashchange listening is disabled or there's no hash deeplink, change to the first page in the DOM + if( !$.mobile.hashListeningEnabled || !$.mobile.path.stripHash( location.hash ) ){ + $.mobile.changePage( $.mobile.firstPage, false, true, false, true ); + } + // otherwise, trigger a hashchange to load a deeplink + else { + $window.trigger( "hashchange", [ true ] ); + } + }, + //support conditions that must be met in order to proceed + gradeA: function(){ + return $.support.mediaquery; + } + }); + + //trigger mobileinit event - useful hook for configuring $.mobile settings before they're used + $( window.document ).trigger( "mobileinit" ); + + //support conditions + //if device support condition(s) aren't met, leave things as they are -> a basic, usable experience, + //otherwise, proceed with the enhancements + if ( !$.mobile.gradeA() ) { + return; + } + + //dom-ready inits + $( $.mobile.initializePage ); + + //window load event + //hide iOS browser chrome on load + $window.load( $.mobile.silentScroll ); +})( jQuery, this ); From b21531a0accb898c0cde9614e10794fb7b2e62e8 Mon Sep 17 00:00:00 2001 From: John Bender Date: Sun, 13 Feb 2011 13:10:11 -0800 Subject: [PATCH 2/7] left gradeA in core, added todo for page element addition refactor --- js/jquery.mobile.core.js | 3 +-- js/jquery.mobile.init.js | 50 ++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js index 00993d17..6fecc275 100644 --- a/js/jquery.mobile.core.js +++ b/js/jquery.mobile.core.js @@ -106,11 +106,10 @@ "" ) : undefined; - + // TODO may be better in mobile.init //add mobile, initial load "rendering" classes to docEl $html.addClass( "ui-mobile ui-mobile-rendering" ); - //define & prepend meta viewport tag, if content is defined $.mobile.metaViewportContent ? $( "", { name: "viewport", content: $.mobile.metaViewportContent}).prependTo( $head ) : undefined; diff --git a/js/jquery.mobile.init.js b/js/jquery.mobile.init.js index 700a74d0..4d09aa4e 100644 --- a/js/jquery.mobile.init.js +++ b/js/jquery.mobile.init.js @@ -8,40 +8,34 @@ */ (function( $, window, undefined ) { - $.extend($.mobile, { - // find and enhance the pages in the dom and transition to the first page. - initializePage: function(){ - //find present pages - var $pages = $( "[data-role='page']" ); + // find and enhance the pages in the dom and transition to the first page. + $.mobile.initializePage = function(){ + //find present pages + var $pages = $( "[data-role='page']" ); - //add dialogs, set data-url attrs - $pages.add( "[data-role='dialog']" ).each(function(){ - $(this).attr( "data-url", $(this).attr( "id" )); - }); + //add dialogs, set data-url attrs + $pages.add( "[data-role='dialog']" ).each(function(){ + $(this).attr( "data-url", $(this).attr( "id" )); + }); - //define first page in dom case one backs out to the directory root (not always the first page visited, but defined as fallback) - $.mobile.firstPage = $pages.first(); + //define first page in dom case one backs out to the directory root (not always the first page visited, but defined as fallback) + $.mobile.firstPage = $pages.first(); - //define page container - $.mobile.pageContainer = $pages.first().parent().addClass( "ui-mobile-viewport" ); + //define page container + $.mobile.pageContainer = $pages.first().parent().addClass( "ui-mobile-viewport" ); - //cue page loading message - $.mobile.pageLoading(); + //cue page loading message + $.mobile.pageLoading(); - // if hashchange listening is disabled or there's no hash deeplink, change to the first page in the DOM - if( !$.mobile.hashListeningEnabled || !$.mobile.path.stripHash( location.hash ) ){ - $.mobile.changePage( $.mobile.firstPage, false, true, false, true ); - } - // otherwise, trigger a hashchange to load a deeplink - else { - $window.trigger( "hashchange", [ true ] ); - } - }, - //support conditions that must be met in order to proceed - gradeA: function(){ - return $.support.mediaquery; + // if hashchange listening is disabled or there's no hash deeplink, change to the first page in the DOM + if( !$.mobile.hashListeningEnabled || !$.mobile.path.stripHash( location.hash ) ){ + $.mobile.changePage( $.mobile.firstPage, false, true, false, true ); } - }); + // otherwise, trigger a hashchange to load a deeplink + else { + $window.trigger( "hashchange", [ true ] ); + } + }; //trigger mobileinit event - useful hook for configuring $.mobile settings before they're used $( window.document ).trigger( "mobileinit" ); From a64a44504b77aaf2ca955262ea5f87fbaac3bbd0 Mon Sep 17 00:00:00 2001 From: John Bender Date: Sun, 13 Feb 2011 13:23:44 -0800 Subject: [PATCH 3/7] moved page additions after gradeA check in init and removed from core --- js/jquery.mobile.core.js | 8 -------- js/jquery.mobile.init.js | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js index 6fecc275..a1873c60 100644 --- a/js/jquery.mobile.core.js +++ b/js/jquery.mobile.core.js @@ -106,14 +106,6 @@ "" ) : undefined; - // TODO may be better in mobile.init - //add mobile, initial load "rendering" classes to docEl - $html.addClass( "ui-mobile ui-mobile-rendering" ); - - //define & prepend meta viewport tag, if content is defined - $.mobile.metaViewportContent ? $( "", { name: "viewport", content: $.mobile.metaViewportContent}).prependTo( $head ) : undefined; - - //expose some core utilities $.extend($.mobile, { diff --git a/js/jquery.mobile.init.js b/js/jquery.mobile.init.js index 4d09aa4e..0118bd61 100644 --- a/js/jquery.mobile.init.js +++ b/js/jquery.mobile.init.js @@ -8,6 +8,9 @@ */ (function( $, window, undefined ) { + var $html = $( "html" ), + $head = $( "head" ); + // find and enhance the pages in the dom and transition to the first page. $.mobile.initializePage = function(){ //find present pages @@ -47,6 +50,12 @@ return; } + //add mobile, initial load "rendering" classes to docEl + $html.addClass( "ui-mobile ui-mobile-rendering" ); + + //define & prepend meta viewport tag, if content is defined + $.mobile.metaViewportContent ? $( "", { name: "viewport", content: $.mobile.metaViewportContent}).prependTo( $head ) : undefined; + //dom-ready inits $( $.mobile.initializePage ); From 270497509504d6dc0ec1d344893f7e8ac8c79485 Mon Sep 17 00:00:00 2001 From: John Bender Date: Sun, 13 Feb 2011 22:37:23 -0800 Subject: [PATCH 4/7] re arranged tests for mobile init --- js/jquery.mobile.init.js | 49 +++++------ tests/unit/core/core.js | 97 +--------------------- tests/unit/core/core_mobileinit.js | 18 ----- tests/unit/core/index.html | 2 +- tests/unit/init/index.html | 32 ++++++++ tests/unit/init/init_core.js | 125 +++++++++++++++++++++++++++++ 6 files changed, 186 insertions(+), 137 deletions(-) delete mode 100644 tests/unit/core/core_mobileinit.js create mode 100644 tests/unit/init/index.html create mode 100644 tests/unit/init/init_core.js diff --git a/js/jquery.mobile.init.js b/js/jquery.mobile.init.js index 0118bd61..500f52b5 100644 --- a/js/jquery.mobile.init.js +++ b/js/jquery.mobile.init.js @@ -9,36 +9,39 @@ (function( $, window, undefined ) { var $html = $( "html" ), - $head = $( "head" ); + $head = $( "head" ), + $window = $( window ); - // find and enhance the pages in the dom and transition to the first page. - $.mobile.initializePage = function(){ - //find present pages - var $pages = $( "[data-role='page']" ); + $.extend($.mobile, { + // find and enhance the pages in the dom and transition to the first page. + initializePage: function(){ + //find present pages + var $pages = $( "[data-role='page']" ); - //add dialogs, set data-url attrs - $pages.add( "[data-role='dialog']" ).each(function(){ - $(this).attr( "data-url", $(this).attr( "id" )); - }); + //add dialogs, set data-url attrs + $pages.add( "[data-role='dialog']" ).each(function(){ + $(this).attr( "data-url", $(this).attr( "id" )); + }); - //define first page in dom case one backs out to the directory root (not always the first page visited, but defined as fallback) - $.mobile.firstPage = $pages.first(); + //define first page in dom case one backs out to the directory root (not always the first page visited, but defined as fallback) + $.mobile.firstPage = $pages.first(); - //define page container - $.mobile.pageContainer = $pages.first().parent().addClass( "ui-mobile-viewport" ); + //define page container + $.mobile.pageContainer = $pages.first().parent().addClass( "ui-mobile-viewport" ); - //cue page loading message - $.mobile.pageLoading(); + //cue page loading message + $.mobile.pageLoading(); - // if hashchange listening is disabled or there's no hash deeplink, change to the first page in the DOM - if( !$.mobile.hashListeningEnabled || !$.mobile.path.stripHash( location.hash ) ){ - $.mobile.changePage( $.mobile.firstPage, false, true, false, true ); + // if hashchange listening is disabled or there's no hash deeplink, change to the first page in the DOM + if( !$.mobile.hashListeningEnabled || !$.mobile.path.stripHash( location.hash ) ){ + $.mobile.changePage( $.mobile.firstPage, false, true, false, true ); + } + // otherwise, trigger a hashchange to load a deeplink + else { + $window.trigger( "hashchange", [ true ] ); + } } - // otherwise, trigger a hashchange to load a deeplink - else { - $window.trigger( "hashchange", [ true ] ); - } - }; + }); //trigger mobileinit event - useful hook for configuring $.mobile settings before they're used $( window.document ).trigger( "mobileinit" ); diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js index 9a4f0aba..05034a5e 100644 --- a/tests/unit/core/core.js +++ b/tests/unit/core/core.js @@ -8,15 +8,11 @@ extendFn = $.extend; module(libName, { - setup: function(){ - // NOTE reset for gradeA tests - $('html').removeClass('ui-mobile'); + teardown: function(){ + $.extend = extendFn; // NOTE reset for pageLoading tests $('.ui-loader').remove(); - }, - teardown: function(){ - $.extend = extendFn; } }); @@ -31,32 +27,6 @@ ok($.mobile.gradeA()); }); - test( "loading the core library triggers mobilinit on the document", function(){ - expect( 1 ); - - $(window.document).bind('mobileinit', function(event){ - ok(true); - }); - - $.testHelper.reloadLib(libName); - }); - - test( "enhancments are skipped when the browser is not grade A", function(){ - setGradeA(false); - $.testHelper.reloadLib(libName); - - //NOTE easiest way to check for enhancements, not the most obvious - ok(!$("html").hasClass("ui-mobile")); - }); - - test( "enhancments are added when the browser is grade A", function(){ - setGradeA(true); - $.testHelper.reloadLib(libName); - - ok($("html").hasClass("ui-mobile")); - }); - - //TODO lots of duplication test( "pageLoading doesn't add the dialog to the page when loading message is false", function(){ $.testHelper.alterExtend({loadingMessage: false}); @@ -81,69 +51,6 @@ $.testHelper.reloadLib(libName); $.mobile.pageLoading(false); ok($(".ui-loader").length); - }); - - var metaViewportSelector = "head meta[name=viewport]", - setViewPortContent = function(value){ - $(metaViewportSelector).remove(); - $.testHelper.alterExtend({metaViewportContent: value}); - $.testHelper.reloadLib(libName); - }; - - test( "meta view port element is added to head when defined on mobile", function(){ - setViewPortContent("width=device-width"); - same($(metaViewportSelector).length, 1); - }); - - test( "meta view port element not added to head when not defined on mobile", function(){ - setViewPortContent(false); - same($(metaViewportSelector).length, 0); - }); - - var findFirstPage = function() { - return $("[data-role='page']").first(); - }; - - test( "active page and start page should be set to the fist page in the selected set", function(){ - var firstPage = findFirstPage(); - $.testHelper.reloadLib(libName); - - same($.mobile.firstPage, firstPage); - same($.mobile.activePage, firstPage); - }); - - test( "mobile viewport class is defined on the first page's parent", function(){ - var firstPage = findFirstPage(); - $.testHelper.reloadLib(libName); - - ok(firstPage.parent().hasClass('ui-mobile-viewport')); - }); - - test( "mobile page container is the first page's parent", function(){ - var firstPage = findFirstPage(); - $.testHelper.reloadLib(libName); - - same($.mobile.pageContainer, firstPage.parent()); - }); - - test( "page loading is called on document ready", function(){ - $.testHelper.alterExtend({ pageLoading: function(){ - start(); - ok("called"); - }}); - - stop(); - $.testHelper.reloadLib(libName); - }); - - test( "hashchange triggered on document ready with single argument: true", function(){ - $(window).bind("hashchange", function(ev, arg){ - same(arg, true); - start(); - }); - - stop(); - $.testHelper.reloadLib(libName); }); }); })(jQuery); \ No newline at end of file diff --git a/tests/unit/core/core_mobileinit.js b/tests/unit/core/core_mobileinit.js deleted file mode 100644 index 3a4b9506..00000000 --- a/tests/unit/core/core_mobileinit.js +++ /dev/null @@ -1,18 +0,0 @@ -/* - * mobile core unit tests - */ - -(function($){ - var mobilePage = undefined; - module('jquery.mobile.core.js'); - - // NOTE important to use $.fn.one here to make sure library reloads don't fire - // the event before the test check below - $(document).one("mobileinit", function(){ - mobilePage = $.mobile.page; - }); - - test( "mobile.page is available when mobile init is fired", function(){ - ok(mobilePage !== undefined, "$.mobile.page is defined"); - }); -})(jQuery); diff --git a/tests/unit/core/index.html b/tests/unit/core/index.html index 60aeb509..c346223b 100644 --- a/tests/unit/core/index.html +++ b/tests/unit/core/index.html @@ -6,8 +6,8 @@ - + diff --git a/tests/unit/init/index.html b/tests/unit/init/index.html new file mode 100644 index 00000000..27001694 --- /dev/null +++ b/tests/unit/init/index.html @@ -0,0 +1,32 @@ + + + + + jQuery Mobile Init Test Suite + + + + + + + + + + + + + + + + +

jQuery Mobile Init Test Suite

+

+

+
    +
+ +
+
+ + + diff --git a/tests/unit/init/init_core.js b/tests/unit/init/init_core.js new file mode 100644 index 00000000..4af57e19 --- /dev/null +++ b/tests/unit/init/init_core.js @@ -0,0 +1,125 @@ +/* + * mobile init tests + */ + +(function($){ + var mobilePage = undefined, mobileSelect = undefined, + libName = 'jquery.mobile.init.js', + setGradeA = function(value) { $.mobile.gradeA = function(){ return value; }; }, + extendFn = $.extend; + + module(libName, { + setup: function(){ + // NOTE reset for gradeA tests + $('html').removeClass('ui-mobile'); + }, + teardown: function(){ + $.extend = extendFn; + } + }); + + // NOTE important to use $.fn.one here to make sure library reloads don't fire + // the event before the test check below + $(document).one("mobileinit", function(){ + mobilePage = $.mobile.page; + mobileSelect = $.mobile.selectmenu; + }); + + test( "mobile.page is available when mobile init is fired", function(){ + ok(mobilePage !== undefined, "$.mobile.page is defined"); + }); + + test( "mobile.selectmenu is available when mobile init is fired", function(){ + ok(mobileSelect !== undefined, "$.mobile.selectmenu is defined"); + }); + + $.testHelper.excludeFileProtocol(function(){ + test( "loading the init library triggers mobilinit on the document", function(){ + expect( 1 ); + + $(window.document).bind('mobileinit', function(event){ + ok(true); + }); + + $.testHelper.reloadLib(libName); + }); + + test( "enhancments are skipped when the browser is not grade A", function(){ + setGradeA(false); + $.testHelper.reloadLib(libName); + + //NOTE easiest way to check for enhancements, not the most obvious + ok(!$("html").hasClass("ui-mobile")); + }); + + test( "enhancments are added when the browser is grade A", function(){ + setGradeA(true); + $.testHelper.reloadLib(libName); + + ok($("html").hasClass("ui-mobile")); + }); + + var metaViewportSelector = "head meta[name=viewport]", + setViewPortContent = function(value){ + $(metaViewportSelector).remove(); + $.mobile.metaViewportContent = value; + $.testHelper.reloadLib( libName ); + }; + + test( "meta view port element not added to head when not defined on mobile", function(){ + setViewPortContent(false); + same($(metaViewportSelector).length, 0); + }); + + test( "meta view port element is added to head when defined on mobile", function(){ + setViewPortContent("width=device-width"); + same($(metaViewportSelector).length, 1); + }); + + var findFirstPage = function() { + return $("[data-role='page']").first(); + }; + + test( "active page and start page should be set to the fist page in the selected set", function(){ + var firstPage = findFirstPage(); + $.testHelper.reloadLib(libName); + + same($.mobile.firstPage, firstPage); + same($.mobile.activePage, firstPage); + }); + + test( "mobile viewport class is defined on the first page's parent", function(){ + var firstPage = findFirstPage(); + $.testHelper.reloadLib(libName); + + ok(firstPage.parent().hasClass('ui-mobile-viewport')); + }); + + test( "mobile page container is the first page's parent", function(){ + var firstPage = findFirstPage(); + $.testHelper.reloadLib(libName); + + same($.mobile.pageContainer, firstPage.parent()); + }); + + test( "page loading is called on document ready", function(){ + $.testHelper.alterExtend({ pageLoading: function(){ + start(); + ok("called"); + }}); + + stop(); + $.testHelper.reloadLib(libName); + }); + + test( "hashchange triggered on document ready with single argument: true", function(){ + $(window).bind("hashchange", function(ev, arg){ + same(arg, true); + start(); + }); + + stop(); + $.testHelper.reloadLib(libName); + }); + }); +})(jQuery); From 421dc352c083789f3d58063053a294fe35edd9dc Mon Sep 17 00:00:00 2001 From: John Bender Date: Mon, 14 Feb 2011 21:38:54 -0800 Subject: [PATCH 5/7] corrected js test includes and simplified to prevent further breakages --- tests/unit/dialog/index.html | 25 +------------------------ tests/unit/navigation/index.html | 25 +------------------------ tests/unit/page/index.html | 25 +------------------------ tests/unit/select/index.html | 25 +------------------------ tests/unit/slider/index.html | 25 +------------------------ 5 files changed, 5 insertions(+), 120 deletions(-) diff --git a/tests/unit/dialog/index.html b/tests/unit/dialog/index.html index 79b62ebe..d0f51b1b 100644 --- a/tests/unit/dialog/index.html +++ b/tests/unit/dialog/index.html @@ -5,30 +5,7 @@ jQuery Mobile Dialog Test Suite - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/tests/unit/navigation/index.html b/tests/unit/navigation/index.html index 7870653c..44f9a100 100644 --- a/tests/unit/navigation/index.html +++ b/tests/unit/navigation/index.html @@ -5,30 +5,7 @@ jQuery Mobile Navigation Test Suite - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/tests/unit/page/index.html b/tests/unit/page/index.html index 2a496cb9..e7dddc6a 100644 --- a/tests/unit/page/index.html +++ b/tests/unit/page/index.html @@ -5,30 +5,7 @@ jQuery Mobile Page Test Suite - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/tests/unit/select/index.html b/tests/unit/select/index.html index cb6ba2cc..7a052285 100644 --- a/tests/unit/select/index.html +++ b/tests/unit/select/index.html @@ -5,30 +5,7 @@ jQuery Mobile Select Events Test Suite - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/tests/unit/slider/index.html b/tests/unit/slider/index.html index cb4b7a21..06858f24 100644 --- a/tests/unit/slider/index.html +++ b/tests/unit/slider/index.html @@ -5,30 +5,7 @@ jQuery Mobile Slider Events Test Suite - - - - - - - - - - - - - - - - - - - - - - - - + From aacb0751be0b77067f68986de43c938d5c151b82 Mon Sep 17 00:00:00 2001 From: John Bender Date: Sun, 20 Feb 2011 18:23:31 -0800 Subject: [PATCH 6/7] fixed build.xml to match js/index.php and the Makefile --- build.xml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/build.xml b/build.xml index 1779bb56..23c4b5c5 100644 --- a/build.xml +++ b/build.xml @@ -19,8 +19,7 @@ jquery.mobile.navbar.css, jquery.mobile.theme.css, jquery.mobile.transitions.css"/> - + + From 62bd20adb96ce1a28375a68b0d69873a04c12dd0 Mon Sep 17 00:00:00 2001 From: John Bender Date: Mon, 21 Feb 2011 08:55:16 -0800 Subject: [PATCH 7/7] fixed build.xml css order Fixes #1075 --- build.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build.xml b/build.xml index 23c4b5c5..e80b1e12 100644 --- a/build.xml +++ b/build.xml @@ -3,22 +3,22 @@ - + jquery.mobile.forms.slider.css"/>