From 7e103f9b726ea98fc1f9af837d38d1272bb480f3 Mon Sep 17 00:00:00 2001
From: John Bender <john.m.bender@gmail.com>
Date: Tue, 18 Dec 2012 10:04:55 -0800
Subject: [PATCH] move navigate events under events directory

---
 js/{navigation/event.js => events/navigate.js}             | 0
 js/index.php                                               | 2 +-
 js/jquery.mobile.init.js                                   | 2 +-
 js/jquery.mobile.js                                        | 2 +-
 js/jquery.mobile.navigation.js                             | 2 +-
 js/navigation/navigator.js                                 | 2 +-
 js/widgets/popup.js                                        | 2 +-
 tests/unit/fixed-toolbar/index.html                        | 1 -
 tests/unit/navigation/event/index.html                     | 2 +-
 tests/unit/navigation/method/index.html                    | 7 ++-----
 .../{ => method}/push-state-disabled-method-tests.html     | 6 +++---
 11 files changed, 12 insertions(+), 16 deletions(-)
 rename js/{navigation/event.js => events/navigate.js} (100%)
 rename tests/unit/navigation/{ => method}/push-state-disabled-method-tests.html (70%)

diff --git a/js/navigation/event.js b/js/events/navigate.js
similarity index 100%
rename from js/navigation/event.js
rename to js/events/navigate.js
diff --git a/js/index.php b/js/index.php
index be83b3ac691..fe6c5f42e8f 100644
--- a/js/index.php
+++ b/js/index.php
@@ -20,7 +20,7 @@
 	'widgets/page.js',
 	'jquery.mobile.core.js',
 	'widgets/loader.js',
-	'navigation/event.js',
+	'events/navigate.js',
 	'navigation/path.js',
 	'navigation/history.js',
 	'navigation/navigator.js',
diff --git a/js/jquery.mobile.init.js b/js/jquery.mobile.init.js
index 58a69e5db40..625bc598b3e 100644
--- a/js/jquery.mobile.init.js
+++ b/js/jquery.mobile.init.js
@@ -8,7 +8,7 @@ define([
 	"jquery",
 	"./jquery.mobile.core",
 	"./jquery.mobile.support",
-	'./navigation/event',
+	'./events/navigate',
 	'./navigation/path',
 	'./navigation/method',
 	"./jquery.mobile.navigation",
diff --git a/js/jquery.mobile.js b/js/jquery.mobile.js
index 88adead080a..adadede654f 100644
--- a/js/jquery.mobile.js
+++ b/js/jquery.mobile.js
@@ -4,7 +4,7 @@
 define([
 	'require',
 	'./widgets/loader',
-	'./navigation/event',
+	'./events/navigate',
 	'./navigation/path',
 	'./navigation/history',
 	'./navigation/navigator',
diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js
index 10f367c07fc..a5e06821f63 100644
--- a/js/jquery.mobile.navigation.js
+++ b/js/jquery.mobile.navigation.js
@@ -7,7 +7,7 @@ define( [
 	"jquery",
 	"./jquery.mobile.core",
 	"./navigation/path",
-	"./navigation/event",
+	"./events/navigate",
 	"./navigation/history",
 	"./navigation/navigator",
 	"./navigation/method",
diff --git a/js/navigation/navigator.js b/js/navigation/navigator.js
index 89840bf6808..1cef20d756b 100644
--- a/js/navigation/navigator.js
+++ b/js/navigation/navigator.js
@@ -2,7 +2,7 @@
 //>>description: Navigation Manager
 //>>label: AJAX Navigation System
 //>>group: Navigation
-define([ "jquery", "./event", "./path", "./history" ], function( $ ) {
+define([ "jquery", "../events/navigate", "./path", "./history" ], function( $ ) {
 //>>excludeEnd("jqmBuildExclude");
 (function( $, undefined ) {
 	var path = $.mobile.path;
diff --git a/js/widgets/popup.js b/js/widgets/popup.js
index 84e754596b5..c512bd5cd93 100644
--- a/js/widgets/popup.js
+++ b/js/widgets/popup.js
@@ -15,7 +15,7 @@ define( [
 	"jquery",
 	"../jquery.mobile.widget",
 	"../jquery.mobile.support",
-	"../navigation/event",
+	"../events/navigate",
 	"../navigation/path",
 	"../navigation/history",
 	"../navigation/navigator",
diff --git a/tests/unit/fixed-toolbar/index.html b/tests/unit/fixed-toolbar/index.html
index f7364d2c2f3..4c8fba57b79 100644
--- a/tests/unit/fixed-toolbar/index.html
+++ b/tests/unit/fixed-toolbar/index.html
@@ -13,7 +13,6 @@
 	<script>
 		$.testHelper.asyncLoad([
 			[
-        "navigation/event",
         "navigation/method",
         "widgets/fixedToolbar"
 			],
diff --git a/tests/unit/navigation/event/index.html b/tests/unit/navigation/event/index.html
index e26d63833c2..ce3e1ecb58a 100644
--- a/tests/unit/navigation/event/index.html
+++ b/tests/unit/navigation/event/index.html
@@ -11,7 +11,7 @@
 	<link rel="stylesheet" href="../../../../external/qunit.css"/>
 	<script>
 		$.testHelper.asyncLoad([
-			[ "navigation/event" ],
+			[ "events/navigate" ],
 			[ "event_core.js" ]
 		], "../../../../js" );
 	</script>
diff --git a/tests/unit/navigation/method/index.html b/tests/unit/navigation/method/index.html
index efb7170fff7..e13d38cda68 100644
--- a/tests/unit/navigation/method/index.html
+++ b/tests/unit/navigation/method/index.html
@@ -11,14 +11,11 @@
 	<link rel="stylesheet" href="../../../../../external/qunit.css"/>
 	<script>
 		$.testHelper.asyncLoad([
-			[
-				"navigation/event",
-				"navigation/method"
-			],
+			[ "navigation/method" ],
 			[ "method_core.js" ]
 		], "../../../../js" );
 	</script>
-	<script src="../swarminject.js"></script>
+	<script src="../../swarminject.js"></script>
 </head>
 <body>
   <div id="qunit"></div>
diff --git a/tests/unit/navigation/push-state-disabled-method-tests.html b/tests/unit/navigation/method/push-state-disabled-method-tests.html
similarity index 70%
rename from tests/unit/navigation/push-state-disabled-method-tests.html
rename to tests/unit/navigation/method/push-state-disabled-method-tests.html
index 2134d87583b..074918cf799 100644
--- a/tests/unit/navigation/push-state-disabled-method-tests.html
+++ b/tests/unit/navigation/method/push-state-disabled-method-tests.html
@@ -4,10 +4,10 @@
   <!-- forces the base-tests into a push state disabled run and allows for
        the test suite runner to pick it up as a seperate test set. See test/unit/ls.php,
        test/unit/runner.js, base-tests.html, and tests/jquery.testHelper.js for more. -->
-	<script src="../../../js/jquery.js"></script>
-	<script src="../../jquery.testHelper.js"></script>
+	<script src="../../../../js/jquery.js"></script>
+	<script src="../../../jquery.testHelper.js"></script>
 	<script type="text/javascript">
-		$.testHelper.pushStateRedirect( "method-tests.html" );
+		$.testHelper.pushStateRedirect( "./" );
 	</script>
 </head>
 <body>