@ardimedia/angular-portal-azure 0.2.7 → 0.2.9

package/apn.d.ts

@@ -47,6 +47,7 @@ declare namespace angularportalazure {
         constructor(portalService: angularportalazure.PortalService, path: string, title: string, subtitle?: string, width?: number);
         listener1: Function;
         path: string;
+        private _path;
         title: string;
         subTitle: string;
         width: {
@@ -123,6 +124,7 @@ declare namespace angularportalazure {
         onActivate(): void;
         navigateTo(arg: any): void;
         onNavigateTo(arg: any): void;
+        comparePaths(path1: string, path2: string): boolean;
         /** close blade. */
         close(): void;
         onCommandBrowse(): void;
@@ -203,17 +205,18 @@ declare namespace angularportalazure {
 }
 declare namespace angularportalazure {
     class Tile {
+        constructor(title: string, bladePath: string, portalService: angularportalazure.PortalService);
         portalService: angularportalazure.PortalService;
         title: string;
         subTitle: string;
         bladePath: string;
+        private _bladePath;
         tileSize: angularportalazure.TileSizes;
         size: string;
         left: string;
         top: string;
         leftN: string;
         topN: string;
-        constructor(title: string, bladePath: string, portalService: angularportalazure.PortalService);
         clicked(): void;
     }
 }

package/apn.js

@@ -170,6 +170,7 @@ var angularportalazure;
             if (subtitle === void 0) { subtitle = ''; }
             if (width === void 0) { width = 200; }
             _super.call(this, portalService);
+            //#endregion
             this.title = '';
             this.subTitle = '';
             this.width = { 'width': '0' };
@@ -239,7 +240,7 @@ var angularportalazure;
             angularportalazure.Debug.write('[angularportalazure-debug] \'Blade\' constructor called.', [this, portalService, path, title, subtitle, width]);
             var that = this;
             this.blade = this;
-            this.path = path.toLowerCase(); // we do not distinguish between lower and upper case path name
+            this.path = path;
             this.title = title;
             this.subTitle = subtitle;
             this.width.width = width + 'px';
@@ -272,13 +273,24 @@ var angularportalazure;
             // Register listener1
             this.listener1 = that.portalService.$rootScope.$on('BladeArea.AddBlade', function (event, args) {
                 angularportalazure.Debug.write('[angularportalazure-debug] \'Blade\' BladeArea.AddBlade event processing.', [this, event, args]);
-                // we do not distinguish between lower and upper case path name
-                if (args.path.toLowerCase() === that.blade.path) {
+                if (that.blade.comparePaths(args.path, that.blade.path)) {
                     that.activate();
                 }
             });
             //#endregion
         }
+        Object.defineProperty(Blade.prototype, "path", {
+            //#region path
+            get: function () {
+                return this._path;
+            },
+            // For the moment we do not distinguish between lower and upper case path name
+            set: function (newPath) {
+                this._path = newPath.toLowerCase();
+            },
+            enumerable: true,
+            configurable: true
+        });
         //#endregion
         //#endregion
         //#region Methods
@@ -297,6 +309,15 @@ var angularportalazure;
         Blade.prototype.onNavigateTo = function (arg) {
             throw new Error('[angularportalazure.Blade] \'onNavigateTo\' is an abstract function. Define one in the derived class.');
         };
+        // At the moment we do not distinguish between lower and upper case path name
+        Blade.prototype.comparePaths = function (path1, path2) {
+            if (path1.toLowerCase() === path2.toLowerCase()) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        };
         /** close blade. */
         Blade.prototype.close = function () {
             angularportalazure.Debug.write('[angularportalazure-debug] \'Blade.close\' called.', [this]);
@@ -465,7 +486,7 @@ var angularportalazure;
             //#region Make sure the blade is not yet show
             this.blades.forEach(function (blade) {
                 // we do not distinguish between lower and upper case path name
-                if (blade.path.toLowerCase() === path.toLowerCase()) {
+                if (blade.comparePaths(blade.path, path)) {
                     throw new Error('[angularportalazure.BladeArea] path: \'' + path + '\' will not be added. It is already added.');
                 }
                 ;
@@ -502,7 +523,7 @@ var angularportalazure;
             // we do not distinguish between lower and upper case path name
             path = path.toLowerCase();
             var isremoved = that.blades.some(function (blade, index) {
-                if (blade.path === path) {
+                if (blade.comparePaths(blade.path, path)) {
                     angularportalazure.Debug.write('[angularportalazure-debug] \'BladeArea.clearPath\' set bladeUrls.length to: ' + index);
                     that.blades.length = index;
                     return true;
@@ -539,7 +560,7 @@ var angularportalazure;
             }
             var isremoved = that.blades.some(function (blade, index) {
                 // we do not distinguish between lower and upper case path name
-                if (blade.path.toLowerCase() === path.toLowerCase()) {
+                if (blade.comparePaths(blade.path, path)) {
                     angularportalazure.Debug.write('[angularportalazure-debug] \'BladeArea.clearChild\' set bladeUrls.length to: ' + (index + 1));
                     that.blades.length = index + 1;
                     return true;
@@ -670,7 +691,6 @@ var angularportalazure;
 var angularportalazure;
 (function (angularportalazure) {
     var Tile = (function () {
-        //#endregion
         //#region Constructors
         function Tile(title, bladePath, portalService) {
             angularportalazure.Debug.write('[angularportalazure-debug] \'Tile\' constructor called.', [this, title, bladePath, portalService]);
@@ -679,6 +699,18 @@ var angularportalazure;
             this.bladePath = bladePath;
             this.tileSize = angularportalazure.TileSizes.normal;
         }
+        Object.defineProperty(Tile.prototype, "bladePath", {
+            //#region bladePath
+            get: function () {
+                return this._bladePath;
+            },
+            // For the moment we do not distinguish between lower and upper case path name
+            set: function (newBladePath) {
+                this._bladePath = newBladePath.toLowerCase();
+            },
+            enumerable: true,
+            configurable: true
+        });
         //#endregion
         //#region Methods
         Tile.prototype.clicked = function () {
@@ -866,23 +898,29 @@ var angularportalazure;
 (function (angularportalazure) {
     function azurePortalBlade($window, portalService) {
         return {
-            transclude: true,
-            scope: { vm: '=vm' },
             restrict: 'E',
+            transclude: true,
+            scope: {},
+            bindToController: { vm: '=' },
             templateUrl: '/node_modules/@ardimedia/angular-portal-azure/directives/blade/blade.html',
-            link: function (scope, element, attrs, controller) {
-                angularportalazure.Debug.write('[angularportalazure-debug] \'directive:azurePortalBlade.link\' called.', [this, portalService]);
-                //#region the following code makes sure, that a function scope.vm.close is available
-                if (scope.vm === undefined) {
-                    scope.vm = {};
-                }
-                if (scope.vm.close === undefined) {
-                    scope.vm.close = function () {
-                        angularportalazure.Debug.write('[angularportalazure-debug] \'directive:azurePortalBlade.close\' called.', [this, portalService]);
-                        portalService.bladeArea.clearLastLevel();
-                    };
-                }
-                //#endregion
+            //link: function (scope, element, attrs, controller) {
+            //    angularportalazure.Debug.write('[angularportalazure-debug] \'directive:azurePortalBlade.link\' called.', [this, portalService]);
+            //    //#region the following code makes sure, that a function scope.vm.close is available
+            //    if (scope.vm === undefined) { scope.vm = {}; }
+            //    if (scope.vm.close === undefined) {
+            //        scope.vm.close = function () {
+            //            angularportalazure.Debug.write('[angularportalazure-debug] \'directive:azurePortalBlade.close\' called.', [this, portalService]);
+            //            portalService.bladeArea.clearLastLevel();
+            //        }
+            //    }
+            //    //#endregion
+            //},
+            controller: function () {
+                var _this = this;
+                this.vm.close = function () {
+                    angularportalazure.Debug.write('[angularportalazure-debug] \'directive:azurePortalBlade.close\' called.', [_this, portalService]);
+                    portalService.bladeArea.clearLastLevel();
+                };
             }
         };
     }

package/directives/blade/blade.ts

@@ -5,24 +5,31 @@
 namespace angularportalazure {
     function azurePortalBlade($window: ng.IWindowService, portalService: angularportalazure.PortalService) {
         return {
-            transclude: true,
-            scope: { vm: '=vm' },
             restrict: 'E',
+            transclude: true,
+            scope: {}, //scope: { vm: '=vm' },
+            bindToController: { vm: '=' },
             templateUrl: '/node_modules/@ardimedia/angular-portal-azure/directives/blade/blade.html',
-            link: function (scope, element, attrs, controller) {
-                angularportalazure.Debug.write('[angularportalazure-debug] \'directive:azurePortalBlade.link\' called.', [this, portalService]);
+            //link: function (scope, element, attrs, controller) {
+            //    angularportalazure.Debug.write('[angularportalazure-debug] \'directive:azurePortalBlade.link\' called.', [this, portalService]);
 
-                //#region the following code makes sure, that a function scope.vm.close is available
+            //    //#region the following code makes sure, that a function scope.vm.close is available
 
-                if (scope.vm === undefined) { scope.vm = {}; }
-                if (scope.vm.close === undefined) {
-                    scope.vm.close = function () {
-                        angularportalazure.Debug.write('[angularportalazure-debug] \'directive:azurePortalBlade.close\' called.', [this, portalService]);
-                        portalService.bladeArea.clearLastLevel();
-                    }
-                }
+            //    if (scope.vm === undefined) { scope.vm = {}; }
+            //    if (scope.vm.close === undefined) {
+            //        scope.vm.close = function () {
+            //            angularportalazure.Debug.write('[angularportalazure-debug] \'directive:azurePortalBlade.close\' called.', [this, portalService]);
+            //            portalService.bladeArea.clearLastLevel();
+            //        }
+            //    }
 
-                //#endregion
+            //    //#endregion
+            //},
+            controller: function () {
+                this.vm.close = () => {
+                    angularportalazure.Debug.write('[angularportalazure-debug] \'directive:azurePortalBlade.close\' called.', [this, portalService]);
+                    portalService.bladeArea.clearLastLevel();
+                };
             }
         };
     }

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