Added MFE as a Submodule

jmbreuer · Apr 19, 2012 · a0e74c4 · a0e74c4
1 parent 3c5da73
commit a0e74c4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "assets/www/MobileFrontend"]
+	path = assets/www/MobileFrontend
+	url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/MobileFrontend.git
diff --git a/assets/www/MobileFrontend b/assets/www/MobileFrontend
diff --git a/assets/www/index.html b/assets/www/index.html
@@ -41,16 +41,16 @@
 	<script type="text/javascript" charset="utf-8" src="js/menu.js"></script>
 
 	<!-- MobileFrontend -->
-	<script type="text/javascript" charset="utf-8" src="js/mobilefrontend.js"></script>
-	<script type="text/javascript" charset="utf-8" src="js/toggle.js"></script>
+	<script type="text/javascript" charset="utf-8" src="MobileFrontend/javascripts/application.js"></script>
+	<script type="text/javascript" charset="utf-8" src="MobileFrontend/javascripts/toggle.js"></script>
 
 	<!-- platform-specific setup and overrides -->
 	<script type="text/javascript" charset="utf-8" src="js/platform-stub.js"></script>
 
 	<link rel="stylesheet" href="leaflet/leaflet.css" />
 
 	<link rel="stylesheet" href="app.css" />  
-	<link rel="stylesheet" href="common.css" />
+	<link rel="stylesheet" href="MobileFrontend/stylesheets/beta_common.css" />
 
 </head>
 

diff --git a/assets/www/js/chrome.js b/assets/www/js/chrome.js
@@ -301,8 +301,8 @@ window.chrome = function() {
 		$('.section_heading button').remove();
 		// setup default MobileFrontend behaviour (including toggle)
 		MobileFrontend.init();
-		if(!noScroll)
-			window.scroll(0,0);
+		MobileFrontend.toggle.init();
+		window.scroll(0,0);
 		appHistory.addCurrentPage();
 		toggleMoveActions();
 		geo.addShowNearbyLinks();