Skip to content

Commit

Permalink
refactor of jquery.mobile.core.js. Moved all of the page navigation m…
Browse files Browse the repository at this point in the history
…odel related scripting into jquery.mobile.navigation.js. This includes event handling for click, submit, and hashchange, all of the base tag management, path management, active link class handling, etc. All existing core tests are passing, and all demos work as expected. More tests are needed in core, and this refactor should make those tests easier to write.
  • Loading branch information
scottjehl committed Nov 25, 2010
1 parent 726166a commit d56380f
Show file tree
Hide file tree
Showing 8 changed files with 536 additions and 503 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ FILES = js/jquery.ui.widget.js \
js/jquery.mobile.support.js \
js/jquery.mobile.event.js \
js/jquery.mobile.hashchange.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 \
Expand All @@ -30,8 +32,7 @@ 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.core.js
js/jquery.mobile.grid.js

CSSFILES = themes/default/jquery.mobile.theme.css \
themes/default/jquery.mobile.core.css \
Expand Down
22 changes: 13 additions & 9 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,20 @@
jquery.mobile.theme.css,
jquery.mobile.transitions.css"/>
<property name="js-sources" value="jquery.js,
jquery.ui.widget.js,
jquery.mobile.widget.js,
jquery.mobile.media.js,
jquery.mobile.support.js,
jquery.mobile.event.js,
jquery.mobile.hashchange.js,
jquery.mobile.core.js,
jquery.mobile.navigation.js,
jquery.mobile.page.js,
jquery.mobile.position.js,
jquery.mobile.buttonMarkup.js,
jquery.mobile.collapsible.js,
jquery.mobile.controlGroup.js,
jquery.mobile.dialog.js,
jquery.mobile.event.js,
jquery.mobile.fieldContain.js,
jquery.mobile.fixHeaderFooter.js,
jquery.mobile.forms.button.js,
Expand All @@ -33,15 +42,10 @@
jquery.mobile.forms.slider.js,
jquery.mobile.forms.textinput.js,
jquery.mobile.grid.js,
jquery.mobile.hashchange.js,
jquery.mobile.core.js,
jquery.mobile.listview.filter.js,
jquery.mobile.listview.js,
jquery.mobile.navbar.js,
jquery.mobile.page.js,
jquery.mobile.support.js,
jquery.mobile.widget.js,
jquery.ui.widget.js"/>
jquery.mobile.listview.filter.js,
jquery.mobile.navbar.js"
/>

<target name="merge">
<antcall target="merge_css" />
Expand Down
2 changes: 1 addition & 1 deletion experiments/themeswitcher/jquery.mobile.themeswitcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'</div>'+
'<div data-role=\'content\' data-theme=\'c\'><ul data-role=\'listview\' data-inset=\'true\'></ul></div>'+
'</div>' )
.appendTo( $.pageContainer ),
.appendTo( $.mobile.pageContainer ),
menu = menuPage.find('ul');

//menu items
Expand Down
1 change: 1 addition & 0 deletions js/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
'jquery.mobile.event.js',
'jquery.mobile.hashchange.js',
'jquery.mobile.core.js',
'jquery.mobile.navigation.js',
'jquery.mobile.page.js',
'jquery.ui.position.js',
'jquery.mobile.fixHeaderFooter.js',
Expand Down
Loading

0 comments on commit d56380f

Please sign in to comment.