update examples

shashank-virtueinfo · Sep 12, 2014 · 19ea6f5 · 19ea6f5
1 parent 6fc5126
commit 19ea6f5
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 67 deletions.
diff --git a/examples/advanced_example.html b/examples/advanced_example.html
@@ -1,17 +1,16 @@
-<!DOCTYPE>
+<!doctype html>
 <html>
   <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <title>MarkerClusterer v3 Example</title>
+    <meta charset="utf-8">
+    <title>MarkerClusterer v3 Advanced Example</title>
 
-    <style type="text/css">
+    <style>
       body {
         margin: 0;
         padding: 10px 20px 20px;
         font-family: Arial;
         font-size: 16px;
       }
-
       #map-container {
         padding: 6px;
         border-width: 1px;
@@ -22,29 +21,25 @@
         box-shadow: rgba(64, 64, 64, 0.1) 0 2px 5px;
         width: 800px;
       }
-
       #map {
         width: 800px;
         height: 400px;
       }
-
       #actions {
         list-style: none;
         padding: 0;
       }
-
       #inline-actions {
         padding-top: 10px;
       }
-
       .item {
         margin-left: 20px;
       }
     </style>
 
-    <script src="http://www.google.com/jsapi"></script>
-    <script src="../src/data.json" type="text/javascript"></script>
-    <script type="text/javascript">
+    <script src="https://maps.googleapis.com/maps/api/js"></script>
+    <script src="data.json"></script>
+    <script>
       var script = '<script type="text/javascript" src="../src/markerclusterer';
       if (document.location.search.indexOf('compiled') !== -1) {
         script += '_compiled';
@@ -53,13 +48,7 @@
       document.write(script);
     </script>
 
-    <script type="text/javascript">
-      google.load('maps', '3', {
-        other_params: 'sensor=false'
-      });
-
-      google.setOnLoadCallback(initialize);
-
+    <script>
       var styles = [[{
         url: '../images/people35.png',
         height: 35,
@@ -142,19 +131,19 @@
           var latLng = new google.maps.LatLng(data.photos[i].latitude,
               data.photos[i].longitude)
           var marker = new google.maps.Marker({
-           position: latLng,
-           draggable: true,
-           icon: markerImage
+            position: latLng,
+            draggable: true,
+            icon: markerImage
           });
           markers.push(marker);
         }
 
         var zoom = parseInt(document.getElementById('zoom').value, 10);
         var size = parseInt(document.getElementById('size').value, 10);
         var style = parseInt(document.getElementById('style').value, 10);
-        zoom = zoom == -1 ? null : zoom;
-        size = size == -1 ? null : size;
-        style = style == -1 ? null: style;
+        zoom = zoom === -1 ? null : zoom;
+        size = size === -1 ? null : size;
+        style = style === -1 ? null: style;
 
         markerClusterer = new MarkerClusterer(map, markers, {
           maxZoom: zoom,
@@ -185,6 +174,7 @@
         markerClusterer.clearMarkers();
       }
 
+      google.maps.event.addDomListener(window, 'load', initialize);
     </script>
   </head>
   <body>

diff --git a/src/data.json → examples/data.json b/src/data.json → examples/data.json
diff --git a/examples/simple_example.html b/examples/simple_example.html
@@ -1,17 +1,15 @@
-<!DOCTYPE>
+<!doctype html>
 <html>
   <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <title>MarkerClusterer v3 Example</title>
-
-    <style type="text/css">
+    <meta charset="utf-8">
+    <title>MarkerClusterer v3 Simple Example</title>
+    <style >
       body {
         margin: 0;
         padding: 10px 20px 20px;
         font-family: Arial;
         font-size: 16px;
       }
-
       #map-container {
         padding: 6px;
         border-width: 1px;
@@ -22,17 +20,15 @@
         box-shadow: rgba(64, 64, 64, 0.1) 0 2px 5px;
         width: 600px;
       }
-
       #map {
         width: 600px;
         height: 400px;
       }
-
     </style>
 
-    <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
-    <script type="text/javascript" src="../src/data.json"></script>
-    <script type="text/javascript">
+    <script src="https://maps.googleapis.com/maps/api/js"></script>
+    <script src="data.json"></script>
+    <script>
       var script = '<script type="text/javascript" src="../src/markerclusterer';
       if (document.location.search.indexOf('compiled') !== -1) {
         script += '_compiled';
@@ -41,7 +37,7 @@
       document.write(script);
     </script>
 
-    <script type="text/javascript">
+    <script>
       function initialize() {
         var center = new google.maps.LatLng(37.4419, -122.1419);
 
@@ -65,6 +61,17 @@
       }
       google.maps.event.addDomListener(window, 'load', initialize);
     </script>
+    <script>
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-12846745-20']);
+      _gaq.push(['_trackPageview']);
+
+      (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' === document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
+    </script>
   </head>
   <body>
     <h3>A simple example of MarkerClusterer (100 markers)</h3>

diff --git a/examples/speed_test.js b/examples/speed_test.js
@@ -57,7 +57,7 @@ speedTest.showMarkers = function() {
 
   for (var i = 0; i < numMarkers; i++) {
     var titleText = speedTest.pics[i].photo_title;
-    if (titleText == '') {
+    if (titleText === '') {
       titleText = 'No title';
     }
 

diff --git a/examples/speed_test_example.html b/examples/speed_test_example.html
@@ -1,38 +1,33 @@
-<!DOCTYPE>
+<!doctype html>
 <html>
   <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <title>MarkerClusterer v3 Example</title>
+    <meta charset="utf-8">
+    <title>MarkerClusterer v3 Speed Test Example</title>
 
-    <style type="text/css">
+    <style>
       body {
         margin: 0;
         padding: 0;
         font-family: Arial;
         font-size: 14px;
       }
-
       #panel {
         float: left;
         width: 300px;
         height: 550px;
       }
-
       #map-container {
         margin-left: 300px;
       }
-
       #map {
         width: 100%;
         height: 550px;
       }
-
       #markerlist {
         height: 400px;
         margin: 10px 5px 0 10px;
         overflow: auto;
       }
-
       .title {
         border-bottom: 1px solid #e0ecff;
         overflow: hidden;
@@ -43,27 +38,21 @@
         color: #000;
         text-decoration: none;
       }
-
       .title:visited {
         color: #000;
       }
-
       .title:hover {
         background: #e0ecff;
       }
-
       #timetaken {
         color: #f00;
       }
-
       .info {
         width: 200px;
       }
-
       .info img {
         border: 0;
       }
-
       .info-body {
         width: 200px;
         height: 200px;
@@ -72,36 +61,40 @@
         text-align: center;
         overflow: hidden;
       }
-
       .info-img {
         height: 220px;
         width: 200px;
       }
-
     </style>
 
-    <script src="http://www.google.com/jsapi"></script>
-    <script src="../src/data.json" type="text/javascript"></script>
-    <script type="text/javascript">
+    <script src="https://maps.googleapis.com/maps/api/js"></script>
+    <script src="data.json"></script>
+    <script>
       var script = '<script type="text/javascript" src="../src/markerclusterer';
       if (document.location.search.indexOf('compiled') !== -1) {
         script += '_compiled';
       }
       script += '.js"><' + '/script>';
       document.write(script);
     </script>
+    <script src="speed_test.js"></script>
 
-    <script type="text/javascript" src="speed_test.js"></script>
-
-    <script type="text/javascript">
-      google.load('maps', '3', {
-      	other_params: 'sensor=false'
-      });
-
-      google.setOnLoadCallback(speedTest.init);
-
+    <script>
+      google.maps.event.addDomListener(window, 'load', speedTest.init);
+    </script>
+    <script>
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-12846745-20']);
+      _gaq.push(['_trackPageview']);
+
+      (function() {
+        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+        ga.src = ('https:' === document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
     </script>
   </head>
+
   <body>
     <div id="panel">
       <h3>An example of MarkerClusterer v3</h3>