From 098713537e7d40b798ab3621d9b86fc0bf867a09 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 30 Aug 2016 10:27:32 -0400
Subject: [PATCH] Update Angular Material to version 1.1.0

---
 NEWS                                              | 1 +
 UI/Templates/ContactsUI/UIxContactFoldersView.wox | 4 ++--
 UI/Templates/MailerUI/UIxMailFolderTemplate.wox   | 2 +-
 UI/Templates/SchedulerUI/UIxCalMainView.wox       | 2 +-
 UI/WebServerResources/angular-material            | 2 +-
 UI/WebServerResources/bower.json                  | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 40778acc8..9cd5fddef 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ New features
 
 Enhancements
  - [web] don't allow a recurrence rule to end before the first occurrence
+ - [web] updated Angular Material to version 1.1.0
 
 Bug fixes
  - [eas] properly generate the BusyStatus for normal events
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 76641f9f3..ab9d0421c 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -464,7 +464,7 @@
                 <div class="sg-progress-linear-bottom">
                   <md-progress-linear class="md-accent"
                                       md-mode="indeterminate"
-                                      ng-show="currentCard.$isLoading()"><!-- progress --></md-progress-linear>
+                                      ng-disabled="!currentCard.$isLoading()"><!-- progress --></md-progress-linear>
                 </div>
               </md-list-item>
             </md-list>
@@ -542,7 +542,7 @@
         <md-progress-circular class="md-accent"
                               md-mode="determinate"
                               md-diameter="20px"
-                              ng-show="$CardsImportDialogController.uploader.isUploading"
+                              ng-disabled="!$CardsImportDialogController.uploader.isUploading"
                               ng-value="$CardsImportDialogController.uploader.progress"><!-- progress --></md-progress-circular>
         <label class="md-button" for="file-input" ng-hide="$CardsImportDialogController.uploader.isUploading">
           <span><var:string label:value="Upload"/></span>
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index cb118cf9d..4fa98659f 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -309,7 +309,7 @@
             <div class="sg-progress-linear-bottom">
               <md-progress-linear class="md-accent"
                                   md-mode="indeterminate"
-                                  ng-show="currentMessage.$isLoading()"><!-- message loading progress --></md-progress-linear>
+                                  ng-disabled="!currentMessage.$isLoading()"><!-- message loading progress --></md-progress-linear>
             </div>
           </md-list-item>
         </md-list>
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index a3e68838f..f29432fbc 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -723,7 +723,7 @@
         <md-progress-circular class="md-accent"
                               md-mode="determinate"
                               md-diameter="20px"
-                              ng-show="$CalendarImportDialogController.uploader.isUploading"
+                              ng-disabled="!$CalendarImportDialogController.uploader.isUploading"
                               ng-value="$CalendarImportDialogController.uploader.progress"><!-- progress --></md-progress-circular>
         <label class="md-button" for="file-input" ng-hide="$CalendarImportDialogController.uploader.isUploading">
           <span><var:string label:value="Upload"/></span>
diff --git a/UI/WebServerResources/angular-material b/UI/WebServerResources/angular-material
index 2ddeb9151..79964dc9d 160000
--- a/UI/WebServerResources/angular-material
+++ b/UI/WebServerResources/angular-material
@@ -1 +1 @@
-Subproject commit 2ddeb915148e00be2d3e1f9c14fb40934c3c592d
+Subproject commit 79964dc9d8f65d3ca066b696c8425167575d8240
diff --git a/UI/WebServerResources/bower.json b/UI/WebServerResources/bower.json
index 0132bd1c0..87f3dabc6 100644
--- a/UI/WebServerResources/bower.json
+++ b/UI/WebServerResources/bower.json
@@ -10,7 +10,7 @@
     "angular-sanitize": "1.4.x",
     "angular-ui-router": "latest",
     "angular-file-upload": "latest",
-    "angular-material": "1.1.0-rc.5-master-2ddeb91",
+    "angular-material": "1.1.0",
     "file-saver.js": "latest",
     "lodash": "latest",
     "ng-sortable": "latest",