- (Bug Fix) Fixed an issue that would cause Craft to break when editi…

…ng entries inline with Google Maps fields
objectivehtml · Dec 2, 2014 · 0d42fd7 · 0d42fd7
1 parent e17b40b
commit 0d42fd7
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 61 deletions.
diff --git a/fieldtypes/GoogleMaps_GoogleMapFieldType.php b/fieldtypes/GoogleMaps_GoogleMapFieldType.php
@@ -214,11 +214,24 @@ public function getInputHtml($name, $value)
 
         craft()->templates->includeJsResource('googlemaps/js/app.compiled.js');
         craft()->templates->includeCssResource('googlemaps/css/app.css');
-        craft()->templates->includeJsFile('//maps.googleapis.com/maps/api/js?key=&sensor=false');
+        craft()->templates->includeJsResource('googlemaps/js/callback.js');
+        craft()->templates->includeJsFile('//maps.googleapis.com/maps/api/js?key=&sensor=false&callback=GoogleMaps.init');
 
         $addressFields = $this->getSettings()->addressFields;
 
         craft()->templates->includeJs("
+        GoogleMaps.data.push(['#$namespacedId-field .oh-google-map-wrapper', {
+            fieldname: '$name',
+            savedData: ".(!empty($value) ? $value->toJson() : "false").",
+            width: '".$this->getSettings()->defaultMapWidth."',
+            height: '".$this->getSettings()->defaultMapHeight."',
+            center: '".$this->getSettings()->defaultMapCenter."',
+            zoom: ".$this->getSettings()->defaultMapZoom.",
+            showButtons: ".json_encode($this->getSettings()->displayButtons).",
+            addressFields: ".($addressFields ? json_encode(explode("\r\n", $this->getSettings()->addressFields)) : 'false')."
+        }]);
+        
+        /*
         new GoogleMaps.Fieldtype('#$namespacedId-field .oh-google-map-wrapper', {
             fieldname: '$name',
             savedData: ".(!empty($value) ? $value->toJson() : "false").",
@@ -228,7 +241,8 @@ public function getInputHtml($name, $value)
             zoom: ".$this->getSettings()->defaultMapZoom.",
             showButtons: ".json_encode($this->getSettings()->displayButtons).",
             addressFields: ".($addressFields ? json_encode(explode("\r\n", $this->getSettings()->addressFields)) : 'false')."
-        });");
+        });
+        */");
 
         return craft()->templates->render('googlemaps/fieldtype', array(
             'name' => $name

diff --git a/resources/js/app.compiled.js b/resources/js/app.compiled.js
@@ -11033,7 +11033,16 @@ function program2(depth0,data) {
 }());
 var GoogleMaps = {
 	Views: {},
-	Models: {}
+	Models: {},
+	data: [],
+	instances: [],
+	init: function() {
+		var t = this;
+
+		_.each(this.data, function(data) {
+			t.instances.push(new GoogleMaps.Fieldtype(data[0], data[1]));
+		});
+	}
 };
 
 (function() {
@@ -11077,6 +11086,8 @@ var GoogleMaps = {
 
 			var App = new Backbone.Marionette.Application();
 
+			this.App = App;
+
 			App.options = options;
 
 			App.addRegions({
@@ -11098,6 +11109,8 @@ var GoogleMaps = {
 				addressFields: options.addressFields
 			});
 
+			this.map = map;
+
 			App.addInitializer(function() {
 
 				setTimeout(function() {
@@ -11125,23 +11138,6 @@ var GoogleMaps = {
 
 
 }());
-
-/*
-
-(function() {
-
-
-
-	GoogleMaps.App = new Backbone.Marionette.Application();
-
-	GoogleMaps.App.addRegions({
-		content: ".oh-google-maps-wrapper"
-	});
-
-	GoogleMaps.App.start();
-
-}());
-*/
 (function() {
 
 	"use strict";

diff --git a/resources/js/app.js b/resources/js/app.js
@@ -1,6 +1,15 @@
 var GoogleMaps = {
 	Views: {},
-	Models: {}
+	Models: {},
+	data: [],
+	instances: [],
+	init: function() {
+		var t = this;
+
+		_.each(this.data, function(data) {
+			t.instances.push(new GoogleMaps.Fieldtype(data[0], data[1]));
+		});
+	}
 };
 
 (function() {
@@ -44,6 +53,8 @@ var GoogleMaps = {
 
 			var App = new Backbone.Marionette.Application();
 
+			this.App = App;
+
 			App.options = options;
 
 			App.addRegions({
@@ -65,6 +76,8 @@ var GoogleMaps = {
 				addressFields: options.addressFields
 			});
 
+			this.map = map;
+
 			App.addInitializer(function() {
 
 				setTimeout(function() {
@@ -92,23 +105,6 @@ var GoogleMaps = {
 
 
 }());
-
-/*
-
-(function() {
-
-	
-
-	GoogleMaps.App = new Backbone.Marionette.Application();
-	
-	GoogleMaps.App.addRegions({
-		content: ".oh-google-maps-wrapper"
-	});
-
-	GoogleMaps.App.start();
-
-}());
-*/
 (function() {
 
 	"use strict";

diff --git a/resources/js/app.min.js b/resources/js/app.min.js
diff --git a/resources/js/app/main.js b/resources/js/app/main.js
@@ -1,6 +1,15 @@
 var GoogleMaps = {
 	Views: {},
-	Models: {}
+	Models: {},
+	data: [],
+	instances: [],
+	init: function() {
+		var t = this;
+
+		_.each(this.data, function(data) {
+			t.instances.push(new GoogleMaps.Fieldtype(data[0], data[1]));
+		});
+	}
 };
 
 (function() {
@@ -44,6 +53,8 @@ var GoogleMaps = {
 
 			var App = new Backbone.Marionette.Application();
 
+			this.App = App;
+
 			App.options = options;
 
 			App.addRegions({
@@ -65,6 +76,8 @@ var GoogleMaps = {
 				addressFields: options.addressFields
 			});
 
+			this.map = map;
+
 			App.addInitializer(function() {
 
 				setTimeout(function() {
@@ -91,21 +104,4 @@ var GoogleMaps = {
 	});
 
 
-}());
-
-/*
-
-(function() {
-
-	
-
-	GoogleMaps.App = new Backbone.Marionette.Application();
-	
-	GoogleMaps.App.addRegions({
-		content: ".oh-google-maps-wrapper"
-	});
-
-	GoogleMaps.App.start();
-
-}());
-*/
+}());