missing file from mobileOpenLayers demo update

git-svn-id: http://svn.dojotoolkit.org/src/demos/trunk@24929 560b804f-0ae3-0310-86f3-f6aa0a117693

Author: ccmitchellusa

mobileOpenLayers/src.js

@@ -1,87 +1,82 @@
-dojo.require("dojox.geo.openlayers.widget.Map");
-dojo.require("dojox.mobile.parser");
-dojo.require("dojox.mobile");
-dojo.requireIf(!dojo.isWebKit, "dojox.mobile.compat");
-dojo.require("demos.mobileOpenLayers.src.NavigationControl");
-require(["dojo/_base/sniff", "dojox/mobile", "dojox/mobile/parser"], function(sniff, mobile, parser) {
-	if(!sniff.isWebKit) {
-		require(["dojox/mobile/compat"], function(compat) {
-		});
+require([ "dojo/_base/sniff", "dojox/mobile", "dojox/mobile/parser",
+		"dojox/geo/openlayers/widget/Map", "demos/mobileOpenLayers/src/NavigationControl" ], function(
+		sniff, mobile, parser){
+	if (!sniff.isWebKit) {
+		require([ "dojox/mobile/compat" ], function(compat){});
 	}
-var map;
-var currentLocation;
+	var map;
+	var currentLocation;
 
-dojo.addOnLoad(function(){
-	var options = {
-		baseLayerName: "TheMap",
-		touchHandler: true,
-		baseLayerType: dojox.geo.openlayers.BaseLayerType.ARCGIS
-	};
-	
-	map = new dojox.geo.openlayers.widget.Map(options);
-	
-	dojo.place(map.domNode, "map");
-	map.startup();
-	
-	var olMap = map.map.getOLMap();
-	var ctrl = new demos.mobileOpenLayers.src.NavigationControl({
-		dojoMap: map
-	});
-	olMap.addControl(ctrl);
-	var mapPage = dijit.byId("mapPage");
-	dojo.connect(mapPage, "onAfterTransitionIn", mapPage, afterTransition);
-	
-	var paris = dijit.byId("paris");
-	dojo.connect(paris, "onClick", paris, click);
-	
-	var ny = dijit.byId("newyork");
-	dojo.connect(ny, "onClick", ny, click);
-	
-	var lc = dijit.byId("lacolle");
-	dojo.connect(lc, "onClick", lc, click);
-	
-	dojo.connect(window, "onresize", resize);
-});
+	dojo.addOnLoad(function(){
+		var options = {
+			baseLayerName : "TheMap",
+			touchHandler : true,
+			baseLayerType : dojox.geo.openlayers.BaseLayerType.ARCGIS
+		};
+
+		map = new dojox.geo.openlayers.widget.Map(options);
+
+		dojo.place(map.domNode, "map");
+		map.startup();
+
+		var olMap = map.map.getOLMap();
+		var ctrl = new demos.mobileOpenLayers.src.NavigationControl({
+			dojoMap : map
+		});
+		olMap.addControl(ctrl);
+		var mapPage = dijit.byId("mapPage");
+		dojo.connect(mapPage, "onAfterTransitionIn", mapPage, afterTransition);
+
+		var paris = dijit.byId("paris");
+		dojo.connect(paris, "onClick", paris, click);
 
+		var ny = dijit.byId("newyork");
+		dojo.connect(ny, "onClick", ny, click);
 
-function afterTransition(){
-	fitTo();
-}
+		var lc = dijit.byId("lacolle");
+		dojo.connect(lc, "onClick", lc, click);
 
-function resize(){
-	setTimeout(updateMap, 0);
-}
+		dojo.connect(window, "onresize", resize);
+	});
+
+	function afterTransition(){
+		fitTo();
+	}
 
-var locs = {
-	paris: [2.350833, 48.856667, 10],
-	newyork: [-74.00597, 40.71427, 11],
-	lacolle: [7.1072435, 43.686842, 15]
-};
+	function resize(){
+		setTimeout(updateMap, 0);
+	}
 
-function click(e){
-	currentLocation = this.id;
-}
+	var locs = {
+		paris : [ 2.350833, 48.856667, 10 ],
+		newyork : [ -74.00597, 40.71427, 11 ],
+		lacolle : [ 7.1072435, 43.686842, 15 ]
+	};
 
-function fitTo(loc){
-	if (!loc) 
-		loc = currentLocation;
-	var l = locs[loc];
-	var p = map.map.transformXY(l[0], l[1]);
-	var ll = new OpenLayers.LonLat(p.x, p.y);
-	var olm = map.map.getOLMap();
-	var center = ll;
-	var zoom = l[2];
-	olm.zoom = null;
-	olm.setCenter(center, zoom);
-}
+	function click(e){
+		currentLocation = this.id;
+	}
 
-function updateMap(){
-	var olm = map.map.getOLMap();
-	var center = olm.getCenter();
-	if (center != null) {
-		var zoom = olm.getZoom();
+	function fitTo(loc){
+		if (!loc)
+			loc = currentLocation;
+		var l = locs[loc];
+		var p = map.map.transformXY(l[0], l[1]);
+		var ll = new OpenLayers.LonLat(p.x, p.y);
+		var olm = map.map.getOLMap();
+		var center = ll;
+		var zoom = l[2];
 		olm.zoom = null;
 		olm.setCenter(center, zoom);
 	}
-}
+
+	function updateMap(){
+		var olm = map.map.getOLMap();
+		var center = olm.getCenter();
+		if (center != null) {
+			var zoom = olm.getZoom();
+			olm.zoom = null;
+			olm.setCenter(center, zoom);
+		}
+	}
 });

mobileOpenLayers/src/NavigationControl.js

@@ -1,7 +1,3 @@
-//dojo.provide("demos.mobileOpenLayers.src.NavigationControl");
-
-//dojo.require("dojox.mobile.IconContainer");
-//dojo.require("dojox.mobile.Button");
 define([ "dojox/mobile/IconContainer", "dojox/mobile/Button" ], function(iconcon, button){
 	return dojo.declare("demos.mobileOpenLayers.src.NavigationControl", [ OpenLayers.Control ], {
 		constructor : function(options, element){