@ardimedia/angular-portal-azure 0.2.66 → 0.2.68

package/apn.d.ts

@@ -333,11 +333,11 @@ declare namespace angularportalazure {
 }
 declare namespace angularportalazure {
     class BladeGrid extends angularportalazure.BladeData {
+        getItemsFunction: any;
         items: any[];
-        constructor(portalService: angularportalazure.PortalService, path: string, title: string, subtitle?: string, width?: number);
+        constructor(portalService: angularportalazure.PortalService, path: string, title: string, subtitle: string, width: number, getItemsFunction: any);
         activate(): void;
-        onActivate(): angular.IHttpPromise<any>;
-        loadItems(f: any): void;
+        loadItems(func: () => any): void;
         onFilter(actual: Object, expected: string): boolean;
         /** Obsolete */
         setObsoleteLayoutProperites(): void;

package/apn.js

@@ -1224,10 +1224,11 @@ var angularportalazure;
         __extends(BladeGrid, _super);
         //#endregion
         //#region Constructor
-        function BladeGrid(portalService, path, title, subtitle, width) {
+        function BladeGrid(portalService, path, title, subtitle, width, getItemsFunction) {
             if (subtitle === void 0) { subtitle = ''; }
             if (width === void 0) { width = 200; }
             var _this = _super.call(this, portalService, path, title, subtitle, width) || this;
+            _this.getItemsFunction = getItemsFunction;
             //#region Properties
             _this.items = [];
             angularportalazure.Debug.write('[angularportalazure-debug] \'BladeGrid\' constructor called.', [_this, portalService, path, title, subtitle, width]);
@@ -1238,46 +1239,46 @@ var angularportalazure;
         //#endregion
         //#region Methods
         BladeGrid.prototype.activate = function () {
-            angularportalazure.Debug.write('[angularportalazure-debug] \'BladeGrid.activate\' called.', [this]);
-            console.log('BladeGrid.activate()');
+            var _this = this;
+            this.loadItems(function () { return _this.getItemsFunction; });
+            //angularportalazure.Debug.write('[angularportalazure-debug] \'BladeGrid.activate\' called.', [this]);
+            //console.log('BladeGrid.activate()');
+            //var that = this;
+            //that.statusbar = 'Daten laden...';
+            //that.statusbarClass = '';
+            ////var onActivate = that.onActivate();
+            ////if (that.onActivate === null || that.onActivate === undefined) {
+            ////} else {
+            //    //that.loadItems(onActivate);
+            //    console.log('call onActivate()');
+            //    that.onActivate()
+            //        .then(function (data: any) {
+            //            console.log('OK');
+            //            that.items = data;
+            //            that.statusbar = '';
+            //            that.statusbarClass = '';
+            //        }).catch(function (exception: angularportalazure.Exception) {
+            //            console.log('exception');
+            //            console.log(exception);
+            //            that.statusbar = 'FEHLER: ' + exception.Message;
+            //            that.statusbarClass = 'message-info message-off';
+            //        });
+            ////}
+        };
+        //onActivate(): angular.IHttpPromise<any> { // any should be: angular.IHttpPromise<any>
+        //    throw new Error('[angularportalazure.BladeGrid] \'onActivate\' is an abstract function. Define one in the derived class.');
+        //}
+        BladeGrid.prototype.loadItems = function (func) {
             var that = this;
             that.statusbar = 'Daten laden...';
             that.statusbarClass = '';
-            //var onActivate = that.onActivate();
-            //if (that.onActivate === null || that.onActivate === undefined) {
-            //} else {
-            //that.loadItems(onActivate);
-            console.log('call onActivate()');
-            that.onActivate()
-                .then(function (data) {
-                console.log('OK');
+            func().then(function (data) {
                 that.items = data;
                 that.statusbar = '';
                 that.statusbarClass = '';
             }).catch(function (exception) {
-                console.log('exception');
-                console.log(exception);
                 that.statusbar = 'FEHLER: ' + exception.Message;
-                that.statusbarClass = 'message-info message-off';
-            });
-            //}
-        };
-        BladeGrid.prototype.onActivate = function () {
-            throw new Error('[angularportalazure.BladeGrid] \'onActivate\' is an abstract function. Define one in the derived class.');
-        };
-        BladeGrid.prototype.loadItems = function (f) {
-            var that = this;
-            console.log('loadItems');
-            console.log(f);
-            f().then(function (data) {
-                that.items = data;
-                that.statusbar = '';
-                that.statusbarClass = '';
-            }).catch(function (exception) {
-                console.log('loadItems.catch');
-                console.log(exception);
-                that.statusbar = 'FEHLER: ' + exception.Message;
-                that.statusbarClass = 'message-info message-off';
+                that.statusbarClass = 'message-error message-off';
             });
         };
         //#region Filter

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