@ardimedia/angular-portal-azure 0.2.109 → 0.2.110

package/apn.d.ts

@@ -58,8 +58,8 @@ declare namespace angularportalazure {
             'width': string;
         };
         isInnerHtml: boolean;
-        statusbar: string;
-        statusbarClass: string;
+        statusBar: string;
+        statusBarClass: string;
         formblade: any;
         isCommandBrowse: boolean;
         commandBrowse: () => void;
@@ -129,8 +129,9 @@ declare namespace angularportalazure {
         comparePaths(path1: string, path2: string): boolean;
         /** close blade. */
         close(): void;
-        clearStatusbar(): void;
-        showExceptionOnStatusbar(exception: angularportalazure.Exception): void;
+        clearStatusBar(): void;
+        setStatusBarLoadData(): void;
+        setStatusBarException(exception: angularportalazure.Exception): void;
         onCommandBrowse(): void;
         onCommandCancel(): void;
         onCommandCopy(): void;
@@ -325,6 +326,7 @@ declare namespace angularportalazure {
         item: any;
         constructor(portalService: angularportalazure.PortalService, path: string, title: string, subtitle?: string, width?: number);
         loadItem(func: () => any): void;
+        onLoadItem(): void;
         onLoadedItem(): void;
         onCommandCancel(): void;
     }
@@ -334,6 +336,7 @@ declare namespace angularportalazure {
         constructor(portalService: angularportalazure.PortalService, path: string, title: string, subtitle?: string, width?: number);
         items: any[];
         loadItems(func: () => angular.IPromise<any>): void;
+        onLoadItems(): void;
         onLoadedItems(): void;
         onFilter(actual: Object, expected: string): boolean;
     }

package/apn.js

@@ -177,8 +177,8 @@ var angularportalazure;
             _this.width = { 'width': '0' };
             _this.widthStackLayout = { 'width': '50px' };
             _this.isInnerHtml = true;
-            _this.statusbar = '';
-            _this.statusbarClass = '';
+            _this.statusBar = '';
+            _this.statusBarClass = '';
             //#endregion
             //#region Commands
             _this.isCommandBrowse = false;
@@ -349,24 +349,28 @@ var angularportalazure;
                 throw new Error('[angularportalazure.Blade] path: \'' + this.path + '\' could not be removed, since no \'this.portalService.bladeArea\' available.');
             }
         };
-        //#region Show Exceptions
-        Blade.prototype.clearStatusbar = function () {
-            this.statusbar = '';
-            this.statusbarClass = '';
+        //#region Set StatusBar
+        Blade.prototype.clearStatusBar = function () {
+            this.statusBar = '';
+            this.statusBarClass = '';
         };
-        Blade.prototype.showExceptionOnStatusbar = function (exception) {
+        Blade.prototype.setStatusBarLoadData = function () {
+            this.statusBar = 'Daten laden...';
+            this.statusBarClass = '';
+        };
+        Blade.prototype.setStatusBarException = function (exception) {
             var that = this;
             if (exception.Message === undefined) {
-                that.statusbar = 'FEHLER: ' + exception;
+                that.statusBar = 'FEHLER: ' + exception;
             }
             else {
-                that.statusbar = 'FEHLER: ' + exception.Message;
-                that.statusbar += ' - ';
+                that.statusBar = 'FEHLER: ' + exception.Message;
+                that.statusBar += ' - ';
                 exception.Messages.forEach(function (item) {
-                    that.statusbar += item + ' - ';
+                    that.statusBar += item + ' - ';
                 });
             }
-            that.statusbarClass = 'message-error message-off';
+            that.statusBarClass = 'message-error message-off';
         };
         //#endregion
         //#endregion
@@ -424,30 +428,6 @@ var angularportalazure;
         };
         //#endregion
         //#region OBSOLETE
-        ///** Obsolete */
-        //setObsoleteLayoutProperites() {
-        //    angularportalazure.Debug.write('[angularportalazure-debug] \'Blade.setObsoleteLayoutProperites\' called.', [this]);
-        //    //this.blade.title = this.title;
-        //    //this.blade.statusbar = this.statusbar;
-        //    //this.blade.statusbarClass = this.statusbarClass;
-        //    //this.blade.isCommandBrowse = this.isCommandBrowse;
-        //    //this.blade.isCommandCancel = this.isCommandCancel;
-        //    //this.blade.isCommandCopy = this.isCommandCopy;
-        //    //this.blade.isCommandDelete = this.isCommandDelete;
-        //    //this.blade.isCommandDocument = this.isCommandDocument;
-        //    //this.blade.isCommandDocument2 = this.isCommandDocument2;
-        //    //this.blade.isCommandDocument3 = this.isCommandDocument3;
-        //    //this.blade.isCommandDocument4 = this.isCommandDocument4;
-        //    //this.blade.isCommandDocument5 = this.isCommandDocument5;
-        //    //this.blade.isCommandNew = this.isCommandNew;
-        //    //this.blade.isCommandOrder = this.isCommandOrder;
-        //    //this.blade.isCommandRestart = this.isCommandRestart;
-        //    //this.blade.isCommandSave = this.isCommandSave;
-        //    //this.blade.isCommandSearch = this.isCommandSearch;
-        //    //this.blade.isCommandStart = this.isCommandStart;
-        //    //this.blade.isCommandStop = this.isCommandStop;
-        //    //this.blade.isCommandSwap = this.isCommandSwap;
-        //}
         /** Obsolete */
         Blade.prototype.bladeClose = function () {
             this.close();
@@ -491,16 +471,17 @@ var angularportalazure;
         //#endregion
         //#region Methods
         BladeArea.prototype.raiseAddBladeEvent = function (args) {
-            var isActivated = false;
+            var isBladeAlreadyShown = false;
             this.blades.forEach(function (blade) {
                 if (blade.path === args.path) {
+                    // Blade is already show, just activate it again
                     blade.onActivate();
-                    isActivated = true;
+                    isBladeAlreadyShown = true;
                     return;
                 }
             });
-            if (!isActivated) {
-                console.log('broadcast: BladeArea.AddBlade');
+            if (!isBladeAlreadyShown) {
+                // Add the blade, since it is not yet shown
                 this.portalService.$rootScope.$broadcast('BladeArea.AddBlade', args);
             }
         };
@@ -1151,58 +1132,32 @@ var angularportalazure;
             var _this = _super.call(this, portalService, path, title, subtitle, width) || this;
             //#region Properties
             _this.item = null;
-            _this.isCommandNew = true;
+            //this.isCommandNew = true;
             _this.commandNewText = 'neu';
-            _this.isCommandSave = true;
+            //this.isCommandSave = true;
             _this.commandSaveText = 'speichern';
-            _this.isCommandDelete = true;
+            //this.isCommandDelete = true;
             _this.commandDeleteText = 'löschen';
-            _this.isCommandCancel = true;
+            //this.isCommandCancel = true;
             _this.commandCancelText = 'abbrechen';
             return _this;
         }
         //#endregion
         //#region Methods
-        //activate() {
-        //    var that = this;
-        //    that.statusbar = 'Daten laden...';
-        //    that.statusbarClass = '';
-        //    var onActivate = that.onActivate();
-        //    if (onActivate === null || onActivate === undefined) {
-        //        that.statusbar = '';
-        //        that.statusbarClass = '';
-        //    } else {
-        //        onActivate.success(function (data: any) {
-        //            that.item = data;
-        //            that.statusbar = '';
-        //            that.statusbarClass = '';
-        //            that.onActivated();
-        //        }).error(function (data: any, status: any, headers: any, config: any) {
-        //            that.item = null;
-        //            that.statusbar = 'FEHLER: ' + data;
-        //            that.statusbarClass = 'message-info message-off';
-        //            that.onActivated();
-        //        });
-        //    }
-        //}
-        //onActivate(): any { // any should be: angular.IHttpPromise<any>
-        //    throw new Error('[angularportalazure.BladeDetail] \'onActivate\' is an abstract function. Define one in the derived class.');
-        //}
-        //onActivated(): void {
-        //    angularportalazure.Debug.write('[angularportalazure-debug] \'onActivated\' called. You could override this.');
-        //}
         BladeDetail.prototype.loadItem = function (func) {
             var that = this;
-            that.statusbar = 'Daten laden...';
-            that.statusbarClass = '';
+            that.onLoadItem();
             func().then(function (data) {
                 that.item = data;
-                that.clearStatusbar();
+                that.clearStatusBar();
                 that.onLoadedItem();
             }).catch(function (exception) {
-                that.showExceptionOnStatusbar(exception);
+                that.setStatusBarException(exception);
             });
         };
+        BladeDetail.prototype.onLoadItem = function () {
+            this.setStatusBarLoadData();
+        };
         BladeDetail.prototype.onLoadedItem = function () {
         };
         BladeDetail.prototype.onCommandCancel = function () {
@@ -1235,18 +1190,20 @@ var angularportalazure;
         //#region Methods
         BladeGrid.prototype.loadItems = function (func) {
             var that = this;
-            that.statusbar = 'Daten laden...';
-            that.statusbarClass = '';
+            that.onLoadItems();
             func().then(function (data) {
                 that.items = data;
-                that.clearStatusbar();
+                that.clearStatusBar();
                 that.onLoadedItems();
             }).catch(function (exception) {
-                that.showExceptionOnStatusbar(exception);
+                that.setStatusBarException(exception);
             });
         };
-        /* Override this function. This function is called from the loadItems function, when the promise is done. */
-        BladeGrid.prototype.onLoadedItems = function () { };
+        BladeGrid.prototype.onLoadItems = function () {
+            this.setStatusBarLoadData();
+        };
+        BladeGrid.prototype.onLoadedItems = function () {
+        };
         //#region Filter
         BladeGrid.prototype.onFilter = function (actual, expected) {
             //#region Documentation

package/directives/blade/blade.html

@@ -2,7 +2,7 @@
     <header class="fxs-blade-header">
         <div class="fxs-blade-statusbar-wrapper">
             <div class="fxs-blade-statusbar">
-                <span ng-class="$ctrl.vm.statusbarClass">{{$ctrl.vm.statusbar}}</span>
+                <span ng-class="$ctrl.vm.statusBarClass">{{$ctrl.vm.statusBar}}</span>
             </div>
         </div>
         <div class="fxs-blade-actions">

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.109",
+  "version": "0.2.110",
   "main": "index.js",
   "typings": "apn.d.ts",
   "dependencies": {