Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-05-04 04:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved page above core in the makefile, build xml, and manifest under js. Fixes #619

Browse source
This commit is contained in:
John Bender 2011-01-22 22:31:16 -08:00
parent 20775a532a
commit b671753039
5 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -14,9 +14,9 @@ FILES = js/jquery.ui.widget.js \
js/jquery.mobile.support.js \
js/jquery.mobile.event.js \
js/jquery.mobile.hashchange.js \
js/jquery.mobile.page.js \
js/jquery.mobile.core.js \
js/jquery.mobile.navigation.js \
js/jquery.mobile.page.js \
js/jquery.ui.position.js \
js/jquery.mobile.fixHeaderFooter.js \
js/jquery.mobile.forms.checkboxradio.js \

10
build.xml
View file

@ -27,9 +27,9 @@
jquery.mobile.support.js,
jquery.mobile.event.js,
jquery.mobile.hashchange.js,
jquery.mobile.page.js,
jquery.mobile.core.js,
jquery.mobile.navigation.js,
jquery.mobile.page.js,
jquery.mobile.buttonMarkup.js,
jquery.mobile.collapsible.js,
jquery.mobile.controlGroup.js,
@ -52,15 +52,15 @@
<antcall target="merge_js" />
</target>
<target name="merge_css">
<target name="merge_css">
<concat destfile="combine/jquery.mobile.css">
<filelist dir="${cssdir}" files="${css-sources}"/>
</concat>
</target>
<target name="merge_js">
<target name="merge_js">
<concat destfile="combine/jquery.mobile.js">
<filelist dir="${jsdir}" files="${js-sources}"/>
</concat>
</target>
</project>
</project>

2
js/index.php
View file

@ -7,9 +7,9 @@ $elements = array(
'jquery.mobile.support.js',
'jquery.mobile.event.js',
'jquery.mobile.hashchange.js',
'jquery.mobile.page.js',
'jquery.mobile.core.js',
'jquery.mobile.navigation.js',
'jquery.mobile.page.js',
'jquery.ui.position.js',
'jquery.mobile.fixHeaderFooter.js',
'jquery.mobile.forms.checkboxradio.js',

18
tests/unit/core/core_mobileinit.js Normal file
View file

@ -0,0 +1,18 @@
/*
* 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 during library reloads 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);

26
tests/unit/core/index.html
View file

@ -5,27 +5,13 @@
<title>jQuery Mobile Core Test Suite</title>
<script type="text/javascript" src="../../../js/jquery.js"></script>
<script type="text/javascript" src="../../../tests/jquery.testHelper.js"></script>
<script type="text/javascript" src="../../../js/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.widget.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.media.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.support.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.event.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.core.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.page.js"></script>
<script type="text/javascript" src="../../../js/jquery.ui.position.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.fixHeaderFooter.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.forms.checkboxradio.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.forms.textinput.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.forms.select.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.buttonMarkup.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.forms.button.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.forms.slider.js"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.controlGroup.js"></script>
<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
<script type="text/javascript" src="../../../external/qunit.js"></script>
<script type="text/javascript" src="core_mobileinit.js"></script>
<script type="text/javascript" src="../../../js/"></script>
<script type="text/javascript" src="../../../js/jquery.mobile.core.js"></script>
<script type="text/javascript" src="../../jquery.testHelper.js"></script>
<link rel="stylesheet" href="../../../themes/default" />
<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
<script type="text/javascript" src="core.js"></script>
<script type="text/javascript" src="core_scroll.js"></script>