Merge pull request #61 from a-musing-moose/correct_dashboard_for_jque…

…ry_1.9 Wrap parseJSON in a try catch
django-oscar · Apr 16, 2013 · 51c20f0 · 51c20f0
2 parents 4478405 + 6b0a742
commit 51c20f0
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/stores/static/stores/js/dashboard.js b/stores/static/stores/js/dashboard.js
@@ -5,13 +5,16 @@ stores.dashboard = {
     defaultLat: 144.9661415816081,
 
     getLatLngFromGeoJSON: function (data) {
-        var point = jQuery.parseJSON(data);
+    	var point = null;
+    	try {
+            point = jQuery.parseJSON(data);
+        } catch (e) {}
 
         if (!point || point.type.toLowerCase() !== "point") {
             return new google.maps.LatLng(
                 stores.dashboard.defaultLng,
                 stores.dashboard.defaultLat
-            );
+                );
         }
 
         // the GeoJSON format provides latitude and longitude
@@ -20,7 +23,7 @@ stores.dashboard = {
         return new google.maps.LatLng(
             point.coordinates[1],
             point.coordinates[0]
-        );
+            );
     },
 
     getGeoJsonFromLatLng: function (data) {
@@ -35,7 +38,7 @@ stores.dashboard = {
 
     init: function () {
         var locationJSON = jQuery('#id_location').val(),
-            latLng;
+        latLng;
 
         if (locationJSON) {
             latLng = stores.dashboard.getLatLngFromGeoJSON(locationJSON);
@@ -44,9 +47,9 @@ stores.dashboard = {
         }
 
         var input = jQuery('#search-text-field'),
-            autocomplete = new google.maps.places.Autocomplete(input[0]),
-            zoom = 17,
-            marker = null;
+        autocomplete = new google.maps.places.Autocomplete(input[0]),
+        zoom = 17,
+        marker = null;
 
         stores.dashboard.map = new google.maps.Map(document.getElementById('store-map'), {
             zoom: zoom,
@@ -119,7 +122,7 @@ stores.dashboard = {
                     input.trigger('change');
                 }
             }
-        );
+            );
     },
 
     updateMarkerPlace: function(marker, place) {
@@ -158,7 +161,7 @@ stores.dashboard = {
                     stores.dashboard.updateMarkerPlace(marker, results[0]);
                 }
             }
-        );
+            );
     }
 };