@ardimedia/angular-portal-azure 0.2.279 → 0.2.280

package/apn.d.ts

@@ -155,8 +155,7 @@ declare namespace angularportalazure {
         onCommandNew(): void;
         onCommandOrder(): void;
         onCommandRestart(): void;
-        onCommandSaveBefore(): void;
-        onCommandSave(): (Promise<void> & angular.IHttpPromise<any>);
+        onCommandSave(): void;
         onCommandSearch(): void;
         onCommandStart(): void;
         onCommandStop(): void;
@@ -374,7 +373,7 @@ declare namespace angularportalazure {
         constructor($scope: angular.IScope, portalService: angularportalazure.PortalService, path: string, title: string, subtitle?: string, width?: number);
         item: T;
         loadItem(func: () => Promise<any>): void;
-        saveItem(func: () => any): void;
+        saveItem(func: () => any): (Promise<void> & angular.IHttpPromise<any>);
         onSaveItem(): void;
         onSavedItem(): void;
         onCommandCancel(): void;

package/apn.js

@@ -214,7 +214,7 @@ var angularportalazure;
             _this.commandRestart = function () { _this.onCommandRestart(); };
             _this.commandRestartText = '';
             _this.isCommandSave = false;
-            _this.commandSave = function () { _this.onCommandSaveBefore(); };
+            _this.commandSave = function () { _this.onCommandSave(); };
             _this.commandSaveText = '';
             _this.isCommandSearch = false;
             _this.commandSearch = function () { _this.onCommandSearch(); };
@@ -413,23 +413,6 @@ var angularportalazure;
         Blade.prototype.onCommandRestart = function () {
             throw new Error('[angularportalazure.Blade] \'onCommandRestart\' is an abstract function. Define one in the derived class.');
         };
-        Blade.prototype.onCommandSaveBefore = function () {
-            var _this = this;
-            console.log('onCommandSave');
-            if (this.isCommandSave) {
-                console.log('isCommandSave true');
-                this.isCommandSave = false;
-                this.setStatusBarSaveData();
-                this.onCommandSave().then(function () {
-                    console.log('onCommandSave...then');
-                    _this.setStatusBar('');
-                    _this.isCommandSave = true;
-                }).catch(function () {
-                    console.log('onCommandSave...catch');
-                    _this.isCommandSave = true;
-                });
-            }
-        };
         Blade.prototype.onCommandSave = function () {
             throw new Error('[angularportalazure.Blade] \'onCommandSave\' is an abstract function. Define one in the derived class.');
         };
@@ -1200,10 +1183,16 @@ var angularportalazure;
                 console.log(this.formblade);
                 return;
             }
-            func().then(function (data) {
+            this.isCommandSave = false;
+            console.log('this.isCommandSave = false;');
+            return func().then(function (data) {
                 _this.item = data;
+                _this.isCommandSave = true;
+                console.log('this.isCommandSave = true;');
                 _this.onSavedItem();
             }).catch(function (exception) {
+                _this.isCommandSave = true;
+                console.log('this.isCommandSave = true;');
                 _this.setStatusBarException(exception);
             });
         };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@ardimedia/angular-portal-azure",
   "description": "Angular Portal Azure - GUI Framework.",
   "author": "Ardimedia Anstalt <info@ardimedia.com> (http://www.ardimedia.com)",
-  "version": "0.2.279",
+  "version": "0.2.280",
   "main": "index.js",
   "typings": "apn.d.ts",
   "dependencies": {