(fix) updated js/css/map files for packaging

UI/WebServerResources/js/Common/Acl.service.js

@@ -48,7 +48,7 @@
     else {
       return Acl.$$resource.fetch(this.folderId, 'acls').then(function(response) {
         _this.users = [];
-        // console.debug(JSON.stringify(users, undefined, 2));
+        //console.debug(JSON.stringify(users, undefined, 2));
         angular.forEach(response.users, function(data) {
           user = new Acl.$User(data);
           user.canSubscribeUser = user.isSubscribed;

UI/WebServerResources/js/Main.js

@@ -1,2 +1,2 @@
-!function(){"use strict";function loginController($scope,$mdDialog,Authentication){$scope.warning=!1,$scope.creds={username:cookieUsername,password:null},$scope.login=function(creds){return $scope.warning=!1,Authentication.login(creds).then(function(url){window.location.href=url},function(msg){$scope.warning=msg.error}),!1},$scope.showAbout=function($event){function AboutDialogController(scope,$mdDialog){scope.closeDialog=function(){$mdDialog.hide()}}$mdDialog.show({targetEvent:$event,templateUrl:"aboutBox.html",controller:AboutDialogController}),AboutDialogController.$inject=["scope","$mdDialog"]}}angular.module("SOGo.MainUI",["SOGo.Common","SOGo.Authentication"]).controller("loginController",loginController),loginController.$inject=["$scope","$mdDialog","Authentication"]}();
+!function(){"use strict";function LoginController($scope,Dialog,$mdDialog,Authentication){function login(){return Authentication.login(vm.creds).then(function(url){window.location.href=url},function(msg){Dialog.alert(l("Authentication Failed"),msg.error)}),!1}function showAbout($event){function AboutDialogController($mdDialog){this.closeDialog=function(){$mdDialog.hide()}}$mdDialog.show({targetEvent:$event,templateUrl:"aboutBox.html",controller:AboutDialogController,controllerAs:"about"}),AboutDialogController.$inject=["$mdDialog"]}var vm=this;vm.creds={username:cookieUsername,password:null},vm.login=login,vm.showAbout=showAbout}angular.module("SOGo.MainUI",["SOGo.Common","SOGo.Authentication"]),LoginController.$inject=["$scope","Dialog","$mdDialog","Authentication"],angular.module("SOGo.MainUI").controller("LoginController",LoginController)}();
 //# sourceMappingURL=Main.js.map

UI/WebServerResources/js/Main.js.map

@@ -1 +1 @@
-{"version":3,"file":"Main.js","sources":["Main/Main.app.js"],"names":["loginController","$scope","$mdDialog","Authentication","warning","creds","username","cookieUsername","password","login","then","url","window","location","href","msg","error","showAbout","$event","AboutDialogController","scope","closeDialog","hide","show","targetEvent","templateUrl","controller","$inject","angular","module"],"mappings":"CAGA,WACE,YAMA,SAASA,iBAAgBC,OAAQC,UAAWC,gBAC1CF,OAAOG,SAAU,EACjBH,OAAOI,OAAUC,SAAUC,eAAgBC,SAAU,MACrDP,OAAOQ,MAAQ,SAASJ,OAQtB,MAPAJ,QAAOG,SAAU,EACjBD,eAAeM,MAAMJ,OAClBK,KAAK,SAASC,KACbC,OAAOC,SAASC,KAAOH,KACtB,SAASI,KACVd,OAAOG,QAAUW,IAAIC,SAElB,GAETf,OAAOgB,UAAY,SAASC,QAO1B,QAASC,uBAAsBC,MAAOlB,WACpCkB,MAAMC,YAAc,WAClBnB,UAAUoB,QARdpB,UAAUqB,MACRC,YAAaN,OACbO,YAAa,gBACbC,WAAYP,wBAEdA,sBAAsBQ,SAAW,QAAS,cAvB9CC,QAAQC,OAAO,eAAgB,cAAe,wBAC3CH,WAAW,kBAAmB1B,iBAEjCA,gBAAgB2B,SAAW,SAAU,YAAa","sourcesContent":["/* -*- Mode: javascript; indent-tabs-mode: nil; c-basic-offset: 2 -*- */\n/* JavaScript for MainUI (SOGoRootPage) */\n\n(function() {\n  'use strict';\n\n  angular.module('SOGo.MainUI', ['SOGo.Common', 'SOGo.Authentication'])\n    .controller('loginController', loginController);\n\n  loginController.$inject = ['$scope', '$mdDialog', 'Authentication'];\n  function loginController($scope, $mdDialog, Authentication) {\n    $scope.warning = false;\n    $scope.creds = { username: cookieUsername, password: null };\n    $scope.login = function(creds) {\n      $scope.warning = false;\n      Authentication.login(creds)\n        .then(function(url) {\n          window.location.href = url;\n        }, function(msg) {\n          $scope.warning = msg.error;\n        });\n      return false;\n    };\n    $scope.showAbout = function($event) {\n      $mdDialog.show({\n        targetEvent: $event,\n        templateUrl: 'aboutBox.html',\n        controller: AboutDialogController\n      });\n      AboutDialogController.$inject = ['scope', '$mdDialog'];\n      function AboutDialogController(scope, $mdDialog) {\n        scope.closeDialog = function() {\n          $mdDialog.hide();\n        };\n      }\n    };\n  }\n})();\n"]}
+{"version":3,"file":"Main.js","sources":["Main/Main.app.js"],"names":["LoginController","$scope","Dialog","$mdDialog","Authentication","login","vm","creds","then","url","window","location","href","msg","alert","l","error","showAbout","$event","AboutDialogController","this","closeDialog","hide","show","targetEvent","templateUrl","controller","controllerAs","$inject","username","cookieUsername","password","angular","module"],"mappings":"CAGA,WACE,YAQA,SAASA,iBAAgBC,OAAQC,OAAQC,UAAWC,gBAOlD,QAASC,SAOP,MANAD,gBAAeC,MAAMC,GAAGC,OACrBC,KAAK,SAASC,KACbC,OAAOC,SAASC,KAAOH,KACtB,SAASI,KACVX,OAAOY,MAAMC,EAAE,yBAA0BF,IAAIG,UAE1C,EAGT,QAASC,WAAUC,QAQjB,QAASC,uBAAsBhB,WAC7BiB,KAAKC,YAAc,WACjBlB,UAAUmB,QATdnB,UAAUoB,MACRC,YAAaN,OACbO,YAAa,gBACbC,WAAYP,sBACZQ,aAAc,UAEhBR,sBAAsBS,SAAW,aAvBnC,GAAItB,IAAKc,IAETd,IAAGC,OAAUsB,SAAUC,eAAgBC,SAAU,MACjDzB,GAAGD,MAAQA,MACXC,GAAGW,UAAYA,UAXjBe,QAAQC,OAAO,eAAgB,cAAe,wBAK9CjC,gBAAgB4B,SAAW,SAAU,SAAU,YAAa,kBAkC5DI,QACGC,OAAO,eACPP,WAAW,kBAAmB1B","sourcesContent":["/* -*- Mode: javascript; indent-tabs-mode: nil; c-basic-offset: 2 -*- */\n/* JavaScript for MainUI (SOGoRootPage) */\n\n(function() {\n  'use strict';\n\n  angular.module('SOGo.MainUI', ['SOGo.Common', 'SOGo.Authentication']);\n\n  /**\n   * @ngInject\n   */\n  LoginController.$inject = ['$scope', 'Dialog', '$mdDialog', 'Authentication'];\n  function LoginController($scope, Dialog, $mdDialog, Authentication) {\n    var vm = this;\n\n    vm.creds = { username: cookieUsername, password: null };\n    vm.login = login;\n    vm.showAbout = showAbout;\n\n    function login() {\n      Authentication.login(vm.creds)\n        .then(function(url) {\n          window.location.href = url;\n        }, function(msg) {\n          Dialog.alert(l('Authentication Failed'), msg.error);\n        });\n      return false;\n    }\n\n    function showAbout($event) {\n      $mdDialog.show({\n        targetEvent: $event,\n        templateUrl: 'aboutBox.html',\n        controller: AboutDialogController,\n        controllerAs: 'about'\n      });\n      AboutDialogController.$inject = ['$mdDialog'];\n      function AboutDialogController($mdDialog) {\n        this.closeDialog = function() {\n          $mdDialog.hide();\n        };\n      }\n    }\n  }\n\n  angular\n    .module('SOGo.MainUI')\n    .controller('LoginController', LoginController);\n})();\n"]}

UI/WebServerResources/js/vendor/angular-material.js

@@ -2,7 +2,7 @@
  * Angular Material Design
  * https://github.com/angular/material
  * @license MIT
- * v0.10.1-rc5-master-f4c91b3
+ * v0.10.1-master-514927a
  */
 (function( window, angular, undefined ){
 "use strict";
@@ -516,8 +516,9 @@ angular.module('material.core')
     var $mdUtil = {
           dom : { },
           now: window.performance ?
-            angular.bind(window.performance, window.performance.now) :
-            Date.now,
+            angular.bind(window.performance, window.performance.now) : Date.now || function() {
+              return new Date().getTime();
+            },
 
           clientRect: function (element, offsetParent, isOffsetRect) {
             var node = getNode(element);
@@ -8005,7 +8006,7 @@ function mdIconDirective($mdIcon, $mdTheming, $mdAria ) {
       }
 
       function shouldUseDefaultFontSet() {
-        return !scope.fontIcon && !scope.fontSet && !attr.hasOwnProperty('class');
+        return !scope.fontIcon && !scope.fontSet;
       }
     }
   }
@@ -9389,6 +9390,7 @@ angular.module('material.components.menu', [
  */
 
 function MenuDirective($mdMenu) {
+  var INVALID_PREFIX = 'Invalid HTML for md-menu: ';
   return {
     restrict: 'E',
     require: 'mdMenu',
@@ -9401,12 +9403,14 @@ function MenuDirective($mdMenu) {
     templateElement.addClass('md-menu');
     var triggerElement = templateElement.children()[0];
     if (!triggerElement.hasAttribute('ng-click')) {
-      triggerElement = triggerElement.querySelector('[ng-click]');
+      triggerElement = triggerElement.querySelector('[ng-click],[ng-mouseenter]');
     }
-    triggerElement && triggerElement.setAttribute('aria-haspopup', 'true');
     if (templateElement.children().length != 2) {
-      throw Error('Invalid HTML for md-menu. Expected two children elements.');
+      throw Error(INVALID_PREFIX + 'Expected two children elements.');
     }
+
+    // Default element for ARIA attributes has the ngClick or ngMouseenter expression
+    triggerElement && triggerElement.setAttribute('aria-haspopup', 'true');
     return link;
   }
 
@@ -9429,50 +9433,68 @@ function MenuDirective($mdMenu) {
 MenuDirective.$inject = ["$mdMenu"];
 
 function MenuController($mdMenu, $attrs, $element, $scope) {
-
   var menuContainer;
   var ctrl = this;
   var triggerElement;
 
-  // Called by our linking fn to provide access to the menu-content
-  // element removed during link
-  this.init = function(setMenuContainer) {
-    menuContainer = setMenuContainer;
-    triggerElement = $element[0].querySelector('[ng-click]');
-  };
+  this.init = angular.bind(this, init);
+  this.open = angular.bind(this, openMenu);
+  this.close = angular.bind(this, closeMenu);
 
-  // Uses the $mdMenu interim element service to open the menu contents
-  this.open = function openMenu(ev) {
+  this.positionMode = angular.bind(this, positionMode);
+  this.offsets = angular.bind(this, offsets);
+
+  // Expose a open function to the child scope for html to use
+  $scope.$mdOpenMenu = this.open;
+
+  /**
+   * Called by our linking fn to provide access to the menu-content
+   * element removed during link
+   */
+  function init(setMenuContainer) {
+    menuContainer = setMenuContainer;
+    // Default element for ARIA attributes has the ngClick or ngMouseenter expression
+    triggerElement = $element[0].querySelector('[ng-click],[ng-mouseenter]');
+  }
+
+  /**
+   * Uses the $mdMenu interim element service to open the menu contents
+   */
+  function openMenu(ev) {
     ev && ev.stopPropagation();
 
-    ctrl.isOpen = true;
+    triggerElement = triggerElement || (ev ? ev.target : $element[0]);
     triggerElement.setAttribute('aria-expanded', 'true');
+
+    ctrl.isOpen = true;
     $mdMenu.show({
       scope: $scope,
       mdMenuCtrl: ctrl,
       element: menuContainer,
-      target: $element[0]
+      target: triggerElement
     });
-  };
-  // Expose a open function to the child scope for html to use
-  $scope.$mdOpenMenu = this.open;
+  }
 
-  // Use the $mdMenu interim element service to close the menu contents
-  this.close = function closeMenu(skipFocus) {
+  /**
+   * Use the $mdMenu interim element service to close the menu contents
+   */
+  function closeMenu(skipFocus) {
     if ( !ctrl.isOpen ) return;
 
     ctrl.isOpen = false;
-    triggerElement.setAttribute('aria-expanded', 'false');
+    triggerElement && triggerElement.setAttribute('aria-expanded', 'false');
     $mdMenu.hide();
 
     if (!skipFocus) {
       $element.children()[0].focus();
     }
-  };
+  }
 
-  // Build a nice object out of our string attribute which specifies the
-  // target mode for left and top positioning
-  this.positionMode = function() {
+  /**
+   * Build a nice object out of our string attribute which specifies the
+   * target mode for left and top positioning
+   */
+  function positionMode() {
     var attachment = ($attrs.mdPositionMode || 'target').split(' ');
 
     // If attachment is a single item, duplicate it for our second value.
@@ -9485,11 +9507,13 @@ function MenuController($mdMenu, $attrs, $element, $scope) {
       left: attachment[0],
       top: attachment[1]
     };
-  };
+  }
 
-  // Build a nice object out of our string attribute which specifies
-  // the offset of top and left in pixels.
-  this.offsets = function() {
+  /**
+   * Build a nice object out of our string attribute which specifies
+   * the offset of top and left in pixels.
+   */
+  function offsets() {
     var offsets = ($attrs.mdOffset || '0 0').split(' ').map(parseFloat);
     if (offsets.length == 2) {
       return {
@@ -9504,7 +9528,7 @@ function MenuController($mdMenu, $attrs, $element, $scope) {
     } else {
       throw Error('Invalid offsets specified. Please follow format <x, y> or <n>');
     }
-  };
+  }
 }
 MenuController.$inject = ["$mdMenu", "$attrs", "$element", "$scope"];
 
@@ -16924,6 +16948,7 @@ function MdTabsController ($scope, $element, $window, $mdConstant, $mdTabInkRipp
   defineBooleanAttribute('noDisconnect');
   defineBooleanAttribute('autoselect');
   defineBooleanAttribute('centerTabs', handleCenterTabs);
+  defineBooleanAttribute('enableDisconnect');
 
   // define public properties
   ctrl.scope             = $scope;
@@ -17020,7 +17045,11 @@ function MdTabsController ($scope, $element, $window, $mdConstant, $mdTabInkRipp
   function defineBooleanAttribute (key, handler) {
     var attr = $attrs.$normalize('md-' + key);
     if (handler) defineProperty(key, handler);
-    $attrs.$observe(attr, function (newValue) { ctrl[ key ] = newValue !== 'false'; });
+    if ($attrs.hasOwnProperty(attr)) updateValue($attrs[attr]);
+    $attrs.$observe(attr, updateValue);
+    function updateValue (newValue) {
+      ctrl[ key ] = newValue !== 'false';
+    }
   }
 
   /**
@@ -17687,10 +17716,10 @@ angular
     .module('material.components.tabs')
     .directive('mdTabs', MdTabs);
 
-function MdTabs ($mdTheming, $mdUtil, $compile) {
+function MdTabs () {
   return {
     scope:            {
-      selectedIndex: '=?mdSelected',
+      selectedIndex: '=?mdSelected'
     },
     template:         function (element, attr) {
       attr[ "$mdTabsTemplate" ] = element.html();
@@ -17778,7 +17807,6 @@ function MdTabs ($mdTheming, $mdUtil, $compile) {
               md-swipe-right="$mdTabsCtrl.swipeContent && $mdTabsCtrl.incrementIndex(-1)"\
               ng-if="$mdTabsCtrl.hasContent"\
               ng-repeat="(index, tab) in $mdTabsCtrl.tabs"\
-              md-connected-if="tab.isActive()"\
               ng-class="{\
                 \'md-no-transition\': $mdTabsCtrl.lastSelectedIndex == null,\
                 \'md-active\':        tab.isActive(),\
@@ -17788,8 +17816,9 @@ function MdTabs ($mdTheming, $mdUtil, $compile) {
               }">\
             <div\
                 md-template="::tab.template"\
+                md-connected-if="tab.isActive()"\
                 md-scope="::tab.parent"\
-                ng-if="tab.shouldRender()"></div>\
+                ng-if="$mdTabsCtrl.enableDisconnect || tab.shouldRender()"></div>\
           </md-tab-content>\
         </md-tabs-content-wrapper>\
       ';
@@ -17799,7 +17828,6 @@ function MdTabs ($mdTheming, $mdUtil, $compile) {
     bindToController: true
   };
 }
-MdTabs.$inject = ["$mdTheming", "$mdUtil", "$compile"];
 
 })();
 (function(){
@@ -17809,28 +17837,43 @@ angular
     .module('material.components.tabs')
     .directive('mdTemplate', MdTemplate);
 
-function MdTemplate ($compile) {
+function MdTemplate ($compile, $mdUtil) {
   return {
     restrict: 'A',
     link:     link,
     scope:    {
       template:     '=mdTemplate',
+      connected:    '=?mdConnectedIf',
       compileScope: '=mdScope'
     },
     require:  '^?mdTabs'
   };
   function link (scope, element, attr, ctrl) {
     if (!ctrl) return;
-    var compileScope = scope.compileScope;
+    var compileScope = ctrl.enableDisconnect ? scope.compileScope.$new() : scope.compileScope;
     element.html(scope.template);
     $compile(element.contents())(compileScope);
     element.on('DOMSubtreeModified', function () {
       ctrl.updatePagination();
       ctrl.updateInkBarStyles();
     });
+    return $mdUtil.nextTick(handleScope);
+
+    function handleScope () {
+      scope.$watch('connected', function (value) { value === false ? disconnect() : reconnect(); });
+      scope.$on('$destroy', reconnect);
+    }
+
+    function disconnect () {
+      if (ctrl.enableDisconnect) $mdUtil.disconnectScope(compileScope);
+    }
+
+    function reconnect () {
+      if (ctrl.enableDisconnect) $mdUtil.reconnectScope(compileScope);
+    }
   }
 }
-MdTemplate.$inject = ["$compile"];
+MdTemplate.$inject = ["$compile", "$mdUtil"];
 
 })();
 (function(){