version 1.4.4

verbb · Mar 13, 2016 · fd3c9b3 · fd3c9b3
1 parent b576988
commit fd3c9b3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/changelog.json b/changelog.json
@@ -1,4 +1,12 @@
 [
+    {
+        "version": "1.4.4",
+        "downloadUrl": "https://github.com/engram-design/FieldManager/archive/1.4.4.zip",
+        "date": "2016-03-14 10:20:00",
+        "notes": [
+            "[Fixed] Normalise all modal save/cancel/clone event handlers."
+        ]
+    },
     {
         "version": "1.4.3",
         "downloadUrl": "https://github.com/engram-design/FieldManager/archive/1.4.3.zip",

diff --git a/fieldmanager/FieldManagerPlugin.php b/fieldmanager/FieldManagerPlugin.php
@@ -14,7 +14,7 @@ public function getName()
 
     public function getVersion()
     {
-        return '1.4.3';
+        return '1.4.4';
     }
 
     public function getSchemaVersion()

diff --git a/fieldmanager/resources/js/fieldmanager.js b/fieldmanager/resources/js/fieldmanager.js
@@ -195,10 +195,8 @@ $(function() {
 	                delete this.hud;
 	            }, this));
 
-	            this.addListener(this.$form, 'submit', 'saveGroupField');
-	            this.addListener($cancelBtn, 'click', function() {
-	                this.hud.hide()
-	            });
+	            this.addListener($saveBtn, 'activate', 'saveGroupField');
+	            this.addListener($cancelBtn, 'activate', 'closeHud');
 
 	            new Craft.HandleGeneratorWithSuffix('#name', '#prefix');
 	        }
@@ -288,10 +286,8 @@ $(function() {
 	                delete this.hud;
 	            }, this));
 
-	            this.addListener(this.$form, 'submit', 'saveGroupField');
-	            this.addListener($cancelBtn, 'click', function() {
-	                this.hud.hide()
-	            });
+	            this.addListener($saveBtn, 'activate', 'saveGroupField');
+	            this.addListener($cancelBtn, 'activate', 'closeHud');
 
 	            new Craft.HandleGeneratorWithSuffix('#name', '#prefix');
 	        }
@@ -310,6 +306,8 @@ $(function() {
                 if (textStatus == 'success' && response.success) {
                     location.href = Craft.getUrl('fieldmanager');
 
+                    Craft.cp.displayNotice(Craft.t('Field group updated.'));
+
                     this.closeHud();
                 } else {
                     Garnish.shake(this.hud.$hud);
@@ -551,9 +549,6 @@ $(function() {
 					Craft.cp.displayError(Craft.t('Could not clone field'));
 				}
 
-				//this.hide();
-				//this.$container.empty();
-
 			}, this));
 
 			this.removeListener(this.$saveBtn, 'click');
@@ -647,8 +642,11 @@ $(function() {
 			Craft.postActionRequest('fields/saveField', params, $.proxy(function(response, textStatus) {
 				this.$footerSpinner.addClass('hidden');
 
+                location.href = Craft.getUrl('fieldmanager');
+
+                Craft.cp.displayNotice(Craft.t('Field updated.'));
+
 				this.onFadeOut();
-				Craft.cp.displayNotice(Craft.t('Field saved.'));
 
 			}, this));