From 4ce2eb1533494cdfaacdb749f60ab93e05798be9 Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Fri, 10 Feb 2017 16:57:14 +0100
Subject: [PATCH] fix dialogs not respecting current theme

---
 .../scripts/dialogs/add-task/add-task-c.html  |  1 +
 .../scripts/dialogs/add-task/add-task-c.js    |  3 ++-
 app-src/scripts/dialogs/dialogs-s.js          | 22 +++++++++++++++++--
 .../dialogs/distractions/distractions-c.html  |  1 +
 .../dialogs/distractions/distractions-c.js    |  3 ++-
 .../jira-add-worklog/jira-add-worklog-c.html  |  3 ++-
 .../jira-add-worklog/jira-add-worklog-c.js    |  3 ++-
 .../jira-set-in-progress-c.html               |  3 ++-
 .../jira-set-in-progress-c.js                 |  3 ++-
 app-src/scripts/dialogs/notes/notes-c.html    |  3 ++-
 app-src/scripts/dialogs/notes/notes-c.js      |  3 ++-
 .../simple-task-summary-c.html                |  3 ++-
 .../simple-task-summary-c.js                  |  3 ++-
 .../task-selection/task-selection-c.html      |  3 ++-
 .../task-selection/task-selection-c.js        |  3 ++-
 .../time-estimate/time-estimate-c.html        |  3 ++-
 .../dialogs/time-estimate/time-estimate-c.js  |  4 +++-
 .../scripts/dialogs/was-idle/was-idle-c.html  |  3 ++-
 .../scripts/dialogs/was-idle/was-idle-c.js    |  3 ++-
 .../scripts/dialogs/welcome/welcome-c.html    |  3 ++-
 app-src/scripts/dialogs/welcome/welcome-c.js  |  3 ++-
 bower.json                                    |  2 +-
 22 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/app-src/scripts/dialogs/add-task/add-task-c.html b/app-src/scripts/dialogs/add-task/add-task-c.html
index 9672bab775..99d1ba98a3 100644
--- a/app-src/scripts/dialogs/add-task/add-task-c.html
+++ b/app-src/scripts/dialogs/add-task/add-task-c.html
@@ -1,4 +1,5 @@
 <md-dialog aria-label="Was Idle Dialog"
+           md-theme="vm.theme"
            class="was-idle-dialog">
   <md-toolbar>
     <div class="md-toolbar-tools">
diff --git a/app-src/scripts/dialogs/add-task/add-task-c.js b/app-src/scripts/dialogs/add-task/add-task-c.js
index 3a985936bc..31f9337f61 100644
--- a/app-src/scripts/dialogs/add-task/add-task-c.js
+++ b/app-src/scripts/dialogs/add-task/add-task-c.js
@@ -14,9 +14,10 @@
     .controller('AddTaskCtrl', AddTaskCtrl);
 
   /* @ngInject */
-  function AddTaskCtrl($mdDialog, Tasks) {
+  function AddTaskCtrl($mdDialog, Tasks, theme) {
     let vm = this;
     vm.task = {};
+    vm.theme = theme;
 
     vm.addTask = () => {
       if (vm.isAddToBacklog) {
diff --git a/app-src/scripts/dialogs/dialogs-s.js b/app-src/scripts/dialogs/dialogs-s.js
index 76110a5049..3b3c74f05e 100644
--- a/app-src/scripts/dialogs/dialogs-s.js
+++ b/app-src/scripts/dialogs/dialogs-s.js
@@ -14,7 +14,7 @@
     .service('Dialogs', Dialogs);
 
   /* @ngInject */
-  function Dialogs($mdDialog, DIALOGS, $q) {
+  function Dialogs($mdDialog, DIALOGS, $q, $document, $localStorage) {
     const dialogQueue = [];
 
     function createDialogObject(dialogName, locals) {
@@ -22,9 +22,19 @@
       const defaults = angular.copy(DIALOGS.DEFAULTS);
       let dialog = angular.extend(defaults, DIALOGS[dialogName]);
 
+      if (!locals) {
+        locals = {};
+      }
+
+      // pass default theme
+      locals = angular.extend(locals, {
+        theme: $localStorage.theme
+      });
+
       // add passed variables
       dialog = angular.extend(dialog, {
-        locals: locals
+        locals: locals,
+        parent: angular.element($document[0].body)
       });
       return dialog;
     }
@@ -54,6 +64,9 @@
               nextDialog.wrapperPromise.resolve(res);
             }, (err) => {
               nextDialog.wrapperPromise.reject(err);
+            })
+            .catch((err) => {
+              nextDialog.wrapperPromise.reject(err);
             });
         } else {
           $mdDialog.show(nextDialog.obj)
@@ -65,6 +78,11 @@
               nextDialog.wrapperPromise.reject(err);
               removeLastResolvedFromQueue();
               openNextInQueue();
+            })
+            .catch((err) => {
+              nextDialog.wrapperPromise.reject(err);
+              removeLastResolvedFromQueue();
+              openNextInQueue();
             });
         }
       }
diff --git a/app-src/scripts/dialogs/distractions/distractions-c.html b/app-src/scripts/dialogs/distractions/distractions-c.html
index 1293bd5151..75232f3d7e 100644
--- a/app-src/scripts/dialogs/distractions/distractions-c.html
+++ b/app-src/scripts/dialogs/distractions/distractions-c.html
@@ -1,4 +1,5 @@
 <md-dialog aria-label="Distractions"
+           md-theme="vm.theme"
            class="distractions">
   <md-toolbar>
     <div class="md-toolbar-tools">
diff --git a/app-src/scripts/dialogs/distractions/distractions-c.js b/app-src/scripts/dialogs/distractions/distractions-c.js
index 6ca97d8d8d..2453732d0f 100644
--- a/app-src/scripts/dialogs/distractions/distractions-c.js
+++ b/app-src/scripts/dialogs/distractions/distractions-c.js
@@ -14,9 +14,10 @@
     .controller('DistractionsCtrl', DistractionsCtrl);
 
   /* @ngInject */
-  function DistractionsCtrl($mdDialog, $localStorage, SimpleToast) {
+  function DistractionsCtrl($mdDialog, $localStorage, SimpleToast, theme) {
     let vm = this;
     vm.r = $localStorage;
+    vm.theme = theme;
     vm.isOpen = false;
 
     vm.close = () => {
diff --git a/app-src/scripts/dialogs/jira-add-worklog/jira-add-worklog-c.html b/app-src/scripts/dialogs/jira-add-worklog/jira-add-worklog-c.html
index 3e695452cb..8c060abaf3 100644
--- a/app-src/scripts/dialogs/jira-add-worklog/jira-add-worklog-c.html
+++ b/app-src/scripts/dialogs/jira-add-worklog/jira-add-worklog-c.html
@@ -1,4 +1,5 @@
-<md-dialog aria-label="Submit worklog to jira">
+<md-dialog aria-label="Submit worklog to jira"
+           md-theme="vm.theme">
   <md-toolbar>
     <div class="md-toolbar-tools">
       <h2>Submit worklog to jira for "{{ vm.taskCopy.originalKey }}"</h2>
diff --git a/app-src/scripts/dialogs/jira-add-worklog/jira-add-worklog-c.js b/app-src/scripts/dialogs/jira-add-worklog/jira-add-worklog-c.js
index d53735a952..647ddb9a0c 100644
--- a/app-src/scripts/dialogs/jira-add-worklog/jira-add-worklog-c.js
+++ b/app-src/scripts/dialogs/jira-add-worklog/jira-add-worklog-c.js
@@ -14,10 +14,11 @@
     .controller('JiraAddWorklogCtrl', JiraAddWorklogCtrl);
 
   /* @ngInject */
-  function JiraAddWorklogCtrl($mdDialog, task, $window, comment) {
+  function JiraAddWorklogCtrl($mdDialog, task, $window, comment, theme) {
     let vm = this;
     const moment = $window.moment;
 
+    vm.theme = theme;
     vm.taskCopy = angular.copy(task);
     vm.taskCopy.started = moment(task.started).milliseconds(0).seconds(0).toDate();
     vm.isUpdateLocalTaskSettings = false;
diff --git a/app-src/scripts/dialogs/jira-set-in-progress/jira-set-in-progress-c.html b/app-src/scripts/dialogs/jira-set-in-progress/jira-set-in-progress-c.html
index 2aa74ccf25..47e192313a 100644
--- a/app-src/scripts/dialogs/jira-set-in-progress/jira-set-in-progress-c.html
+++ b/app-src/scripts/dialogs/jira-set-in-progress/jira-set-in-progress-c.html
@@ -1,4 +1,5 @@
-<md-dialog aria-label="Jira Set In Progress Dialog">
+<md-dialog aria-label="Jira Set In Progress Dialog"
+           md-theme="vm.theme">
 
   <md-toolbar>
     <div class="md-toolbar-tools">
diff --git a/app-src/scripts/dialogs/jira-set-in-progress/jira-set-in-progress-c.js b/app-src/scripts/dialogs/jira-set-in-progress/jira-set-in-progress-c.js
index 100f2b6d8f..8fa0b6efc5 100644
--- a/app-src/scripts/dialogs/jira-set-in-progress/jira-set-in-progress-c.js
+++ b/app-src/scripts/dialogs/jira-set-in-progress/jira-set-in-progress-c.js
@@ -14,8 +14,9 @@
     .controller('JiraSetInProgressCtrl', JiraSetInProgressCtrl);
 
   /* @ngInject */
-  function JiraSetInProgressCtrl($mdDialog, task, transitions, localType, $window, $localStorage) {
+  function JiraSetInProgressCtrl($mdDialog, task, transitions, localType, $window, $localStorage, theme) {
     let vm = this;
+    vm.theme = theme;
     vm.transitions = transitions;
     vm.task = task;
     vm.localType = localType;
diff --git a/app-src/scripts/dialogs/notes/notes-c.html b/app-src/scripts/dialogs/notes/notes-c.html
index c37840b457..f217c3727b 100644
--- a/app-src/scripts/dialogs/notes/notes-c.html
+++ b/app-src/scripts/dialogs/notes/notes-c.html
@@ -1,5 +1,6 @@
 <md-dialog aria-label="Notes"
-           class="notes-dialog fullscreen-dialog">
+           class="notes-dialog fullscreen-dialog"
+           md-theme="vm.theme">
   <md-toolbar>
     <div class="md-toolbar-tools">
       <h2>Notes for {{ vm.r.currentProject.title || 'Project' }}</h2>
diff --git a/app-src/scripts/dialogs/notes/notes-c.js b/app-src/scripts/dialogs/notes/notes-c.js
index 630c3b2832..b7cffb3656 100644
--- a/app-src/scripts/dialogs/notes/notes-c.js
+++ b/app-src/scripts/dialogs/notes/notes-c.js
@@ -14,11 +14,12 @@
     .controller('NotesCtrl', NotesCtrl);
 
   /* @ngInject */
-  function NotesCtrl($mdDialog, $localStorage) {
+  function NotesCtrl($mdDialog, $localStorage, theme) {
     if (!$localStorage.note) {
       $localStorage.note = 'write some note';
     }
     this.r = $localStorage;
+    this.theme = theme;
 
     this.cancel = () => {
       $mdDialog.hide();
diff --git a/app-src/scripts/dialogs/simple-task-summary/simple-task-summary-c.html b/app-src/scripts/dialogs/simple-task-summary/simple-task-summary-c.html
index 753175fff4..faa49c2f93 100644
--- a/app-src/scripts/dialogs/simple-task-summary/simple-task-summary-c.html
+++ b/app-src/scripts/dialogs/simple-task-summary/simple-task-summary-c.html
@@ -1,5 +1,6 @@
 <md-dialog aria-label="Task list export"
-           class="dialog-simple-task-summary">
+           class="dialog-simple-task-summary"
+           md-theme="vm.theme">
   <md-toolbar>
     <div class="md-toolbar-tools">
       <h2>Task List Export</h2>
diff --git a/app-src/scripts/dialogs/simple-task-summary/simple-task-summary-c.js b/app-src/scripts/dialogs/simple-task-summary/simple-task-summary-c.js
index d5c87762da..72c74a4f55 100644
--- a/app-src/scripts/dialogs/simple-task-summary/simple-task-summary-c.js
+++ b/app-src/scripts/dialogs/simple-task-summary/simple-task-summary-c.js
@@ -14,8 +14,9 @@
     .controller('SimpleTaskSummaryCtrl', SimpleTaskSummaryCtrl);
 
   /* @ngInject */
-  function SimpleTaskSummaryCtrl($mdDialog, tasks, settings, TasksUtil, $scope, ParseDuration, SimpleToast) {
+  function SimpleTaskSummaryCtrl($mdDialog, tasks, settings, TasksUtil, $scope, ParseDuration, SimpleToast, theme) {
     let vm = this;
+    vm.theme = theme;
 
     // init clipboard button
     // dirty but good enough for now
diff --git a/app-src/scripts/dialogs/task-selection/task-selection-c.html b/app-src/scripts/dialogs/task-selection/task-selection-c.html
index 7196f282eb..9de096e5b1 100644
--- a/app-src/scripts/dialogs/task-selection/task-selection-c.html
+++ b/app-src/scripts/dialogs/task-selection/task-selection-c.html
@@ -1,5 +1,6 @@
 <md-dialog aria-label="Time estimation dialog"
-           class="dialog-task-selection">
+           class="dialog-task-selection"
+           md-theme="vm.theme">
   <form ng-submit="vm.submit()">
 
     <md-dialog-content>
diff --git a/app-src/scripts/dialogs/task-selection/task-selection-c.js b/app-src/scripts/dialogs/task-selection/task-selection-c.js
index e9e692625e..5869f3a1b2 100644
--- a/app-src/scripts/dialogs/task-selection/task-selection-c.js
+++ b/app-src/scripts/dialogs/task-selection/task-selection-c.js
@@ -14,8 +14,9 @@
     .controller('TaskSelectionCtrl', TaskSelectionCtrl);
 
   /* @ngInject */
-  function TaskSelectionCtrl($mdDialog, Tasks) {
+  function TaskSelectionCtrl($mdDialog, Tasks, theme) {
     let vm = this;
+    vm.theme = theme;
 
     vm.undoneTasks = Tasks.getUndoneToday(true);
 
diff --git a/app-src/scripts/dialogs/time-estimate/time-estimate-c.html b/app-src/scripts/dialogs/time-estimate/time-estimate-c.html
index e0c5c556b3..c8b8f6c501 100644
--- a/app-src/scripts/dialogs/time-estimate/time-estimate-c.html
+++ b/app-src/scripts/dialogs/time-estimate/time-estimate-c.html
@@ -1,5 +1,6 @@
 <md-dialog aria-label="Time estimation and time spent dialog"
-           class="dialog-time-estimate">
+           class="dialog-time-estimate"
+           md-theme="vm.theme">
   <md-toolbar>
     <div class="md-toolbar-tools">
       <h2>Make an estimate / adjust time spent</h2>
diff --git a/app-src/scripts/dialogs/time-estimate/time-estimate-c.js b/app-src/scripts/dialogs/time-estimate/time-estimate-c.js
index 14549991e1..13ce0a948e 100644
--- a/app-src/scripts/dialogs/time-estimate/time-estimate-c.js
+++ b/app-src/scripts/dialogs/time-estimate/time-estimate-c.js
@@ -14,8 +14,10 @@
     .controller('TimeEstimateCtrl', TimeEstimateCtrl);
 
   /* @ngInject */
-  function TimeEstimateCtrl($mdDialog, task, Tasks, TasksUtil, $window) {
+  function TimeEstimateCtrl($mdDialog, task, Tasks, TasksUtil, $window, theme) {
     let vm = this;
+    vm.theme = theme;
+
     const moment = $window.moment;
 
     // TODO refactor and add to Tasks.service
diff --git a/app-src/scripts/dialogs/was-idle/was-idle-c.html b/app-src/scripts/dialogs/was-idle/was-idle-c.html
index 2c050f2948..cd3b64d885 100644
--- a/app-src/scripts/dialogs/was-idle/was-idle-c.html
+++ b/app-src/scripts/dialogs/was-idle/was-idle-c.html
@@ -1,5 +1,6 @@
 <md-dialog aria-label="Was Idle Dialog"
-           class="was-idle-dialog">
+           class="was-idle-dialog"
+           md-theme="vm.theme">
   <md-toolbar>
     <div class="md-toolbar-tools">
       <h2>Glad you're back!</h2>
diff --git a/app-src/scripts/dialogs/was-idle/was-idle-c.js b/app-src/scripts/dialogs/was-idle/was-idle-c.js
index b0f5e54f78..73ddf59aa7 100644
--- a/app-src/scripts/dialogs/was-idle/was-idle-c.js
+++ b/app-src/scripts/dialogs/was-idle/was-idle-c.js
@@ -14,8 +14,9 @@
     .controller('WasIdleCtrl', WasIdleCtrl);
 
   /* @ngInject */
-  function WasIdleCtrl($mdDialog, $localStorage, $scope, Tasks, $window, idleTime, minIdleTimeInMs) {
+  function WasIdleCtrl($mdDialog, $localStorage, $scope, Tasks, $window, idleTime, minIdleTimeInMs, theme) {
     let vm = this;
+    vm.theme = theme;
     const IPC_EVENT_IDLE = 'WAS_IDLE';
     const IPC_EVENT_UPDATE_TIME_SPEND_FOR_CURRENT = 'UPDATE_TIME_SPEND';
 
diff --git a/app-src/scripts/dialogs/welcome/welcome-c.html b/app-src/scripts/dialogs/welcome/welcome-c.html
index cbce1dec7e..4820a1f7dd 100644
--- a/app-src/scripts/dialogs/welcome/welcome-c.html
+++ b/app-src/scripts/dialogs/welcome/welcome-c.html
@@ -1,5 +1,6 @@
 <md-dialog aria-label="Welcome Dialog"
-           class="welcome-dialog">
+           class="welcome-dialog"
+           md-theme="vm.theme">
   <md-toolbar>
     <div class="md-toolbar-tools">
       <h2>Welcome to Super Productivity!</h2>
diff --git a/app-src/scripts/dialogs/welcome/welcome-c.js b/app-src/scripts/dialogs/welcome/welcome-c.js
index 00566c5a0f..414f4b5645 100644
--- a/app-src/scripts/dialogs/welcome/welcome-c.js
+++ b/app-src/scripts/dialogs/welcome/welcome-c.js
@@ -14,8 +14,9 @@
     .controller('WelcomeCtrl', WelcomeCtrl);
 
   /* @ngInject */
-  function WelcomeCtrl($mdDialog, $localStorage, IS_ELECTRON) {
+  function WelcomeCtrl($mdDialog, $localStorage, IS_ELECTRON, theme) {
     let vm = this;
+    vm.theme = theme;
 
     vm.IS_ELECTRON = IS_ELECTRON;
 
diff --git a/bower.json b/bower.json
index cd06e2b148..0309205673 100644
--- a/bower.json
+++ b/bower.json
@@ -21,7 +21,7 @@
     "angular-resource": "1.6.2",
     "angular-ui-router": "latest",
     "ngstorage": "^0.3.11",
-    "angular-material": "^1.1.1",
+    "angular-material": "^1.1.3",
     "angular-material-icons": "^0.7.1",
     "lodash": "^4.17.3",
     "moment": "^2.17.1",