manual merged changes from '0b1a46d'

rossengeorgiev · rossengeorgiev · commit 041cc3db8197 · 2013-01-20T13:11:47.000+02:00
diff --git a/index.html b/index.html
@@ -9,7 +9,7 @@
         <link rel="stylesheet" href="css/mobile.css"/>
         <link rel="shortcut icon" href="favicon.ico" />
     </head>
-    <body onload="load();">
+    <body>
 
     <div id="loading"></div>
 
@@ -98,7 +98,11 @@ <h2>Chase car mode</h2>
         </div>
     </div>
     </div>
-    <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;sensor=false&amp;key=AIzaSyCOqkcNey4CCyG4X0X5qxHAhCgD8g5DwXg" type="text/javascript"></script>
-    <script type="text/javascript" language="javascript" src="js/mobile.js"></script>
+    <script src="http://maps.google.com/maps/api/js?sensor=false&key=AIzaSyCOqkcNey4CCyG4X0X5qxHAhCgD8g5DwXg" type="text/javascript"></script>
+    <script type="text/javascript" language="javascript" src="js/jquery-1.8.3-min.js"></script>
+    <script type="text/javascript" language="javascript" src="js/balloonmarker.js"></script>
+    <script type="text/javascript" language="javascript" src="js/iscroll.js"></script>
+    <script type="text/javascript" language="javascript" src="js/tracker.js"></script>
+    <script type="text/javascript" language="javascript" src="js/app.js"></script>
     </body>
 </html>
diff --git a/js/app.js b/js/app.js
@@ -298,4 +298,7 @@ $(window).ready(function() {
             window.scrollTo(0,1);
         }, 500);
     }, 100);
+
+    // finally load map
+    load();
 });
diff --git a/js/balloonmarker.js b/js/balloonmarker.js
@@ -29,7 +29,7 @@ function BalloonMarker(latlng, opts) {
 
 /* BalloonMarker extends GOverlay class from the Google Maps API
  */
-BalloonMarker.prototype = new GOverlay();
+BalloonMarker.prototype = new google.maps.OverlayView();
 
 /* Creates the DIV representing this BalloonMarker.
  * @param map {GMap2} Map that bar overlay is added to.
@@ -56,7 +56,7 @@ BalloonMarker.prototype.initialize = function(map) {
     div.style.backgroundPosition = "" + ((image_width - image_shadow_width)/2) + "px " + (image_height + me.altitude_ - image_shadow_height) + "px";
   }
 
-  GEvent.addDomListener(this.img_, "click", function(event) {
+  google.maps.Event.addDomListener(this.img_, "click", function(event) {
     me.clicked_ = 1;
     GEvent.trigger(me, "click");
   });
diff --git a/js/tracker.js b/js/tracker.js
