@ardimedia/angular-portal-azure 0.2.144 → 0.2.145

package/apn.d.ts

@@ -36,7 +36,6 @@ declare namespace angularportalazure {
 declare namespace angularportalazure {
     class UserControlBase {
         constructor($scope: angular.IScope, portalService: angularportalazure.PortalService);
-        $scope: angular.IScope;
         portalService: angularportalazure.PortalService;
         setupWindowResizeListener(callback: () => void): void;
     }
@@ -339,6 +338,7 @@ declare namespace angularportalazure {
         $q: angular.IQService;
         $rootScope: angular.IRootScopeService;
         $window: angular.IWindowService;
+        $timeout: angular.ITimeoutService;
         $translate: angular.translate.ITranslateService;
     }
 }

package/apn.js

@@ -44,58 +44,6 @@ var angularportalazure;
         return null;
     }
 })(angularportalazure || (angularportalazure = {}));
-///// <reference types="angular" />
-///// <reference path="../../domain/debug.ts" />
-///// <reference path="../../domain/portalservice.ts" />
-"use strict";
-//namespace angularportalazure {
-//    angularPortalBladeGrid.$inject = ['angularportalazure.portalService'];
-//    function angularPortalBladeGrid(portalService: angularportalazure.PortalService) {
-//        return {
-//            restrict: 'E',
-//            transclude: true,
-//            scope: {},
-//            bindToController: { vm: '=' },
-//            templateUrl: '/node_modules/@ardimedia/angular-portal-azure/directives/blade/blade.html',
-//            link: function (scope: angular.IScope, element, attrs, controller) { },
-//            controller: function () {
-//                this.$onInit = function () {
-//                    this.close = function () {
-//                        //portalService.areaBlades.clearLastLevel();
-//                    };
-//                };
-//            },
-//            controllerAs: '$ctrl'
-//        };
-//    }
-//    angular.module('angularportalazure').directive('angularPortalBladeGrid', angularPortalBladeGrid);
-//}
-///// <reference types="angular" />
-///// <reference path="../../domain/debug.ts" />
-///// <reference path="../../domain/portalservice.ts" />
-"use strict";
-//namespace angularportalazure {
-//    angularPortalBladeNav.$inject = ['angularportalazure.portalService'];
-//    function angularPortalBladeNav(portalService: angularportalazure.PortalService) {
-//        return {
-//            restrict: 'E',
-//            transclude: true,
-//            scope: {},
-//            bindToController: { vm: '=' },
-//            templateUrl: '/node_modules/@ardimedia/angular-portal-azure/directives/blade/blade.html',
-//            link: function (scope:angular.IScope, element, attrs, controller) { },
-//            controller: function () {
-//                this.$onInit = function () {
-//                    this.close = function () {
-//                        //portalService.areaBlades.clearLastLevel();
-//                    };
-//                };
-//            },
-//            controllerAs: '$ctrl'
-//        };
-//    }
-//    angular.module('angularportalazure').directive('angularPortalBladeNav', angularPortalBladeNav);
-//}
 //#region Make sure console.log is working in any case, even IE9
 "use strict";
 //if ($('html').hasClass('k-ie9')) {
@@ -227,8 +175,9 @@ var angularportalazure;
     var UserControlBase = (function () {
         //#region Constructor
         function UserControlBase($scope, portalService) {
-            this.$scope = $scope;
+            //this.$scope = $scope;
             this.portalService = portalService;
+            this.portalService.$scope = $scope;
         }
         //#endregion
         //#region Methods
@@ -375,9 +324,9 @@ var angularportalazure;
                     _this.portalService.areaBlades.blades[index] = _this;
                 }
             });
+            _this.setBladeHeights();
+            _this.setupWindowResizeListener(function () { _this.setBladeHeights(); });
             return _this;
-            //this.setBladeHeights();
-            //this.setupWindowResizeListener(() => { this.setBladeHeights(); });
         }
         Object.defineProperty(Blade.prototype, "path", {
             get: function () {
@@ -542,15 +491,16 @@ var angularportalazure;
         Blade.prototype.setTitle = function (watchExpression, func) {
             var _this = this;
             if (this.watcherTitle === undefined) {
-                this.watcherTitle = this.$scope.$watch(watchExpression, function () { func(); });
-                this.$scope.$on('$destroy', function () { _this.watcherTitle(); });
+                this.watcherTitle = this.portalService.$scope.$watch(watchExpression, function () { func(); });
+                this.portalService.$scope.$on('$destroy', function () { _this.watcherTitle(); });
             }
         };
         Blade.prototype.setBladeHeights = function () {
-            console.log(this.portalService.$window.document.getElementById('apa-blade-content'));
-            console.log(this.portalService.$window.document.getElementById('apa-blade-content').style.height);
-            this.bladeContentHeight = Number(this.portalService.$window.document.getElementById('apa-blade-content').style.height.replace('px', ''));
-            this.bladeContentInnerHeight = this.bladeContentHeight - 20;
+            var _this = this;
+            this.portalService.$timeout(function () {
+                _this.bladeContentHeight = _this.portalService.$window.innerHeight - 125; // header
+                _this.bladeContentInnerHeight = _this.bladeContentHeight - 50; // padding
+            });
             //// http://stackoverflow.com/questions/4298612/jquery-how-to-call-resize-event-only-once-its-finished-resizing
             //var id: NodeJS.Timer;
             //$(window).resize(function () {
@@ -659,7 +609,7 @@ var angularportalazure;
             });
             //#endregion
             //#region Show the blade
-            var blade = new angularportalazure.Blade(that.$scope, that.portalService, path, '');
+            var blade = new angularportalazure.Blade(that.portalService.$scope, that.portalService, path, '');
             that.blades.push(blade);
             //#endregion
             //#region Position the blade
@@ -1103,8 +1053,8 @@ var angularportalazure;
             _this.isVisible = true;
             _this.title = title;
             _this.portalService.panorama = _this;
-            _this.avatarMenu = new angularportalazure.AvatarMenu(_this.$scope, _this.portalService);
-            _this.startboard = new angularportalazure.Startboard(_this.$scope, _this.portalService);
+            _this.avatarMenu = new angularportalazure.AvatarMenu(_this.portalService.$scope, _this.portalService);
+            _this.startboard = new angularportalazure.Startboard(_this.portalService.$scope, _this.portalService);
             return _this;
         }
         return Panorama;
@@ -1127,7 +1077,7 @@ var angularportalazure;
             var _this = _super.call(this, null, portalService) || this;
             _this.portalService = portalService;
             _this.portalService.portalShell = _this;
-            _this.portalService.panorama = new angularportalazure.Panorama(_this.$scope, title, _this.portalService);
+            _this.portalService.panorama = new angularportalazure.Panorama(_this.portalService.$scope, title, _this.portalService);
             //this.portalService.areaBlades = new angularportalazure.BladeArea(this.$scope, portalService);
             _this.portalService.panorama.title = title;
             return _this;
@@ -1160,6 +1110,7 @@ var angularportalazure;
             this.$rootScope = $injector.get('$rootScope');
             this.$window = $injector.get('$window');
             this.$analytics = $injector.get('$analytics');
+            this.$timeout = $injector.get('$timeout');
             this.$translate = $injector.get('$translate');
             this.ngDialog = $injector.get('ngDialog');
             this.ngDialog.openConfirm;

package/directives/blade/blade.html

@@ -222,7 +222,7 @@
             </div>
         </div>
     </header>
-    <div id="apa-blade-content" class="fxs-blade-content fxs-pannable" style="height:calc(100% - 125px);">
+    <div class="fxs-blade-content fxs-pannable" ng-style="{'height': $ctrl.vm.bladeContentInnerHeight}">
         <div class="fxs-blade-stacklayout fxs-stacklayout fxs-stacklayout-vertical" ng-style="$ctrl.vm.widthStackLayout">
             <div class="fxs-stacklayout-child">
                 <div class="fxs-lens">
@@ -237,17 +237,16 @@
                                 <section class="fxs-part-content css-scope-HubsExtension">
                                     <div tabindex="0" class="fxcontrol-base azc-control azc-theme-frost azc-grid-focusableRow azc-grid-selectableRow azc-grid-activateableRow azc-grid-rightClickableRow azc-grid azc-grid-headerHidden Formatter FormatterHtmlBindings Focusable Selectable RightClickableRow" data-bind="pcGrid: $root" data-control="true">
                                         <!--<div class="azc-grid-container">-->
+                                        <!-- neutral -->
+                                        <div data-ng-if="$ctrl.vm.isInnerHtml">
+                                            <div ng-transclude></div>
+                                        </div>
 
-                                            <!-- neutral -->
-                                            <div data-ng-if="$ctrl.vm.isInnerHtml">
-                                                <div ng-transclude></div>
-                                            </div>
+                                        <!-- nav -->
+                                        <angular-portal-nav data-ng-if="$ctrl.vm.isNav" vm="$ctrl.vm"></angular-portal-nav>
 
-                                            <!-- nav -->
-                                            <angular-portal-nav data-ng-if="$ctrl.vm.isNav" vm="$ctrl.vm"></angular-portal-nav>
-
-                                            <!-- grid -->
-                                            <angular-portal-grid data-ng-if="$ctrl.vm.isNavGrid" vm="$ctrl.vm"></angular-portal-grid>
+                                        <!-- grid -->
+                                        <angular-portal-grid data-ng-if="$ctrl.vm.isNavGrid" vm="$ctrl.vm"></angular-portal-grid>
 
                                         <!--</div>-->
                                     </div>

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

package/directives/blade/angular-portal-blade-grid.ts

@@ -1,27 +0,0 @@
-///// <reference types="angular" />
-///// <reference path="../../domain/debug.ts" />
-///// <reference path="../../domain/portalservice.ts" />
-
-//namespace angularportalazure {
-//    angularPortalBladeGrid.$inject = ['angularportalazure.portalService'];
-//    function angularPortalBladeGrid(portalService: angularportalazure.PortalService) {
-//        return {
-//            restrict: 'E',
-//            transclude: true,
-//            scope: {},
-//            bindToController: { vm: '=' },
-//            templateUrl: '/node_modules/@ardimedia/angular-portal-azure/directives/blade/blade.html',
-//            link: function (scope: angular.IScope, element, attrs, controller) { },
-//            controller: function () {
-//                this.$onInit = function () {
-//                    this.close = function () {
-//                        //portalService.areaBlades.clearLastLevel();
-//                    };
-//                };
-//            },
-//            controllerAs: '$ctrl'
-//        };
-//    }
-
-//    angular.module('angularportalazure').directive('angularPortalBladeGrid', angularPortalBladeGrid);
-//}

package/directives/blade/angular-portal-blade-nav.ts

@@ -1,27 +0,0 @@
-///// <reference types="angular" />
-///// <reference path="../../domain/debug.ts" />
-///// <reference path="../../domain/portalservice.ts" />
-
-//namespace angularportalazure {
-//    angularPortalBladeNav.$inject = ['angularportalazure.portalService'];
-//    function angularPortalBladeNav(portalService: angularportalazure.PortalService) {
-//        return {
-//            restrict: 'E',
-//            transclude: true,
-//            scope: {},
-//            bindToController: { vm: '=' },
-//            templateUrl: '/node_modules/@ardimedia/angular-portal-azure/directives/blade/blade.html',
-//            link: function (scope:angular.IScope, element, attrs, controller) { },
-//            controller: function () {
-//                this.$onInit = function () {
-//                    this.close = function () {
-//                        //portalService.areaBlades.clearLastLevel();
-//                    };
-//                };
-//            },
-//            controllerAs: '$ctrl'
-//        };
-//    }
-
-//    angular.module('angularportalazure').directive('angularPortalBladeNav', angularPortalBladeNav);
-//}