Permalink
Browse files

restructure navigation files to represent their functionality

  • Loading branch information...
1 parent d8fe5d7 commit 1ad3001520b6f5f8be0ad6df41fb4e01d90ce35e @johnbender johnbender committed Dec 18, 2012
View
@@ -20,11 +20,11 @@
'widgets/page.js',
'jquery.mobile.core.js',
'widgets/loader.js',
- 'navigation/events/navigate.js',
+ 'navigation/event.js',
'navigation/path.js',
'navigation/history.js',
'navigation/navigator.js',
- 'navigation/navigate.js',
+ 'navigation/method.js',
'jquery.mobile.navigation.js',
'jquery.mobile.transition.js',
'transitions/pop.js',
View
@@ -8,9 +8,9 @@ define([
"jquery",
"./jquery.mobile.core",
"./jquery.mobile.support",
- './navigation/events/navigate',
+ './navigation/event',
'./navigation/path',
- './navigation/navigate',
+ './navigation/method',
"./jquery.mobile.navigation",
"./widgets/loader",
"./jquery.mobile.vmouse",
View
@@ -4,9 +4,11 @@
define([
'require',
'./widgets/loader',
- './navigation/events/navigate',
+ './navigation/event',
'./navigation/path',
- './navigation/navigate',
+ './navigation/history',
+ './navigation/navigator',
+ './navigation/method',
'./jquery.mobile.navigation',
'./jquery.mobile.transitions',
'./jquery.mobile.degradeInputs',
@@ -7,7 +7,10 @@ define( [
"jquery",
"./jquery.mobile.core",
"./navigation/path",
- "./navigation/navigate",
+ "./navigation/event",
+ "./navigation/history",
+ "./navigation/navigator",
+ "./navigation/method",
"./jquery.mobile.events",
"./jquery.mobile.support",
"depend!./jquery.hashchange[jquery]",
@@ -4,8 +4,7 @@
//>>group: Navigation
// TODO break out pushstate support test so we don't depend on the whole thing
-define([ "jquery",
- "./../../jquery.mobile.support" ], function( $ ) {
+define([ "jquery", "./../jquery.mobile.support" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
(function( $, undefined ) {
File renamed without changes.
@@ -2,7 +2,7 @@
//>>description: Navigation Manager
//>>label: AJAX Navigation System
//>>group: Navigation
-define([ "jquery", "./events/navigate", "./path", "./history" ], function( $ ) {
+define([ "jquery", "./event", "./path", "./history" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
(function( $, undefined ) {
var path = $.mobile.path;
View
@@ -15,9 +15,11 @@ define( [
"jquery",
"../jquery.mobile.widget",
"../jquery.mobile.support",
- "../navigation/events/navigate",
+ "../navigation/event",
"../navigation/path",
- "../navigation/navigate",
+ "../navigation/history",
+ "../navigation/navigator",
+ "../navigation/method",
"../jquery.mobile.navigation",
"depend!../jquery.hashchange[jquery]" ], function( $ ) {
//>>excludeEnd("jqmBuildExclude");
@@ -13,8 +13,8 @@
<script>
$.testHelper.asyncLoad([
[
- "navigation/events/navigate",
- "navigation/navigate",
+ "navigation/event",
+ "navigation/method",
"widgets/fixedToolbar"
],
[ "jquery.mobile.init" ],
@@ -11,7 +11,7 @@
<link rel="stylesheet" href="../../../../external/qunit.css"/>
<script>
$.testHelper.asyncLoad([
- [ "navigation/events/navigate" ],
+ [ "navigation/event" ],
[ "navigate_core.js" ]
], "../../../../js" );
</script>
@@ -12,9 +12,9 @@
<script>
$.testHelper.asyncLoad([
[
- "navigation/events/navigate",
- "navigation/navigate"
- ],
+ "navigation/event",
+ "navigation/method"
+ ],
[ "navigate_method.js" ]
]);
</script>

0 comments on commit 1ad3001

Please sign in to comment.