Adapt to latest md changes

UI/WebServerResources/js/Common/navController.js

@@ -29,11 +29,17 @@
     }, window.currentDay.secondsBeforeTomorrow * 1000);
 
     $scope.toggleLeft = function() {
-      $scope.leftIsClose = leftIsClose();
-      $mdSidenav('left').toggle()
-        .then(function () {
-          $log.debug("toggle left is done");
-        });
+      if ($scope.isGtMedium) {
+        // Left sidenav is toggled while sidenav is locked open; bypass $mdSidenav
+        $scope.leftIsClose = !$scope.leftIsClose;
+      }
+      else {
+        $scope.leftIsClose = leftIsClose();
+        $mdSidenav('left').toggle()
+          .then(function () {
+            $log.debug("toggle left is done");
+          });
+      }
     };
     $scope.toggleRight = function() {
       $mdSidenav('right').toggle()

UI/WebServerResources/js/Common/sgFolderStylesheet.directive.js

@@ -42,7 +42,8 @@
         '    color: {{ cssCtrl.contrast(cssCtrl.ngModel.color) }} !important;',
         '  }',
         // Set the contrast color of input labels
-        '  .bg-folder{{ cssCtrl.ngModel.id }} label {',
+        '  .bg-folder{{ cssCtrl.ngModel.id }} label,',
+        '  .bg-folder{{ cssCtrl.ngModel.id }} .md-input {',
         '    color: {{ cssCtrl.contrast(cssCtrl.ngModel.color) }} !important;',
         '    opacity: 0.8;',
         '  }',
@@ -56,10 +57,10 @@
         '    border-color: {{ cssCtrl.ngModel.color }} !important;',
         '  }',
         /* Checkbox color */
-        '  .checkbox-folder{{ cssCtrl.ngModel.id }} .md-icon {',
+        '  .checkbox-folder{{ cssCtrl.ngModel.id }} ._md-icon {',
         '    background-color: {{ cssCtrl.ngModel.color }} !important;',
         '  }',
-        '  .checkbox-folder{{ cssCtrl.ngModel.id }}.md-checked .md-icon:after {',
+        '  .checkbox-folder{{ cssCtrl.ngModel.id }}.md-checked ._md-icon:after {',
         '    border-color: {{ cssCtrl.contrast(cssCtrl.ngModel.color) }} !important;',
         '  }',
         '</style>'

UI/WebServerResources/js/Contacts/AddressBookController.js

@@ -29,7 +29,7 @@
     vm.newMessage = newMessage;
     vm.newMessageWithSelectedCards = newMessageWithSelectedCards;
     vm.newMessageWithRecipient = newMessageWithRecipient;
-    vm.mode = { search: false };
+    vm.mode = { search: false, multiple: 0 };
     
     function selectCard(card) {
       $state.go('app.addressbook.card.view', {addressbookId: stateAddressbook.id, cardId: card.id});
@@ -37,6 +37,7 @@
     
     function toggleCardSelection($event, card) {
       card.selected = !card.selected;
+      vm.mode.multiple += card.selected? 1 : -1;
       $event.preventDefault();
       $event.stopPropagation();
     }
@@ -84,7 +85,10 @@
     }
 
     function unselectCards() {
-      _.forEach(vm.selectedFolder.$cards, function(card) { card.selected = false; });
+      _.forEach(vm.selectedFolder.$cards, function(card) {
+        card.selected = false;
+      });
+      vm.mode.multiple = 0;
     }
     
     function confirmDeleteSelectedCards() {
@@ -116,6 +120,7 @@
       _.forEach(vm.selectedFolder.$cards, function(card) {
         card.selected = true;
       });
+      vm.mode.multiple = vm.selectedFolder.$cards.length;
     }
 
     function sort(field) {

UI/WebServerResources/js/Mailer/MailboxController.js

@@ -34,7 +34,7 @@
     vm.sortedBy = sortedBy;
     vm.cancelSearch = cancelSearch;
     vm.newMessage = newMessage;
-    vm.mode = { search: false };
+    vm.mode = { search: false, multiple: 0 };
 
     function selectMessage(message) {
       if (Mailbox.$virtualMode)
@@ -45,12 +45,16 @@
 
     function toggleMessageSelection($event, message) {
       message.selected = !message.selected;
+      vm.mode.multiple += message.selected? 1 : -1;
       $event.preventDefault();
       $event.stopPropagation();
     }
 
     function unselectMessages() {
-      _.forEach(vm.selectedFolder.$messages, function(message) { message.selected = false; });
+      _.forEach(vm.selectedFolder.$messages, function(message) {
+        message.selected = false;
+      });
+      vm.mode.multiple = 0;
     }
 
     function confirmDeleteSelectedMessages() {
@@ -96,6 +100,7 @@
     function unselectMessage(message, index) {
       // Unselect current message and cleverly load the next message
       var nextMessage, previousMessage, nextIndex = index;
+      vm.mode.multiple = vm.selectedFolder.$selectedCount();
       if (message) {
         if (Mailbox.$virtualMode) {
           $state.go('mail.account.virtualMailbox');
@@ -158,6 +163,7 @@
       var i = 0, length = vm.selectedFolder.$messages.length;
       for (; i < length; i++)
         vm.selectedFolder.$messages[i].selected = true;
+      vm.mode.multiple = length;
     }
 
     function markSelectedMessagesAsFlagged() {

UI/WebServerResources/js/Scheduler/CalendarListController.js

@@ -21,13 +21,14 @@
     vm.openEvent = openEvent;
     vm.openTask = openTask;
     vm.newComponent = newComponent;
+    vm.filterpopup = filterpopup;
     vm.filter = filter;
     vm.filteredBy = filteredBy;
     vm.sort = sort;
     vm.sortedBy = sortedBy;
     vm.reload = reload;
     vm.cancelSearch = cancelSearch;
-    vm.mode = { search: false };
+    vm.mode = { search: false, multiple: 0 };
 
     // Select list based on user's settings
     Preferences.ready().then(function() {
@@ -59,17 +60,22 @@
     }
 
     function unselectComponents() {
-      _.forEach(Component['$' + vm.componentType], function(component) { component.selected = false; });
+      _.forEach(Component['$' + vm.componentType], function(component) {
+        component.selected = false;
+      });
+      vm.mode.multiple = 0;
     }
 
     function selectAll() {
       _.forEach(Component['$' + vm.componentType], function(component) {
         component.selected = true;
       });
+      vm.mode.multiple = Component['$' + vm.componentType].length;
     }
 
     function toggleComponentSelection($event, component) {
       component.selected = !component.selected;
+      vm.mode.multiple += component.selected? 1 : -1;
       $event.preventDefault();
       $event.stopPropagation();
     }
@@ -282,6 +288,10 @@
       }
     }
 
+    function filterpopup() {
+      return Component['$query' + vm.componentType.capitalize()].filterpopup;
+    }
+
     function filter(filterpopup) {
       Component.$filter(vm.componentType, { filterpopup: filterpopup });
     }