Fixed: Cancelling editing a modal will reset to previous saved state

src/UI/Settings/Metadata/MetadataEditView.js

@@ -5,40 +5,21 @@ define(
         'vent',
         'marionette',
         'Mixins/AsModelBoundView',
-        'Mixins/AsValidatedView'
-    ], function (vent, Marionette, AsModelBoundView, AsValidatedView) {
+        'Mixins/AsValidatedView',
+        'Mixins/AsEditModalView'
+    ], function (vent, Marionette, AsModelBoundView, AsValidatedView, AsEditModalView) {
 
         var view = Marionette.ItemView.extend({
             template: 'Settings/Metadata/MetadataEditViewTemplate',
 
-            ui: {
-                activity: '.x-activity'
-            },
-
-            events: {
-                'click .x-save'        : '_save'
-            },
-
-            _save: function () {
-                this.ui.activity.html('<i class="icon-nd-spinner"></i>');
-
-                var self = this;
-                var promise = this.model.save();
-
-                if (promise) {
-                    promise.done(function () {
-                        vent.trigger(vent.Commands.CloseModalCommand);
-                    });
-
-                    promise.fail(function () {
-                        self.ui.activity.empty();
-                    });
-                }
+            _onAfterSave: function () {
+                vent.trigger(vent.Commands.CloseModalCommand);
             }
         });
 
         AsModelBoundView.call(view);
         AsValidatedView.call(view);
+        AsEditModalView.call(view);
 
         return view;
     });

src/UI/Settings/Metadata/MetadataEditViewTemplate.html

@@ -35,7 +35,7 @@
         </div>
     </div>
     <div class="modal-footer">
-        <span class="x-activity"></span>
+        <span class="indicator x-indicator"><i class="icon-spinner icon-spin"></i></span>
 
         <button class="btn" data-dismiss="modal">cancel</button>
         <button class="btn btn-primary x-save">save</button>