Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

1 files changed, 16 insertions, 1 deletions

diff --git a/webclient/app-controller.js b/webclient/app-controller.js
index 7fa87e30c1..96656e12c3 100644
--- a/webclient/app-controller.js
+++ b/webclient/app-controller.js
@@ -45,8 +45,14 @@ angular.module('MatrixWebClientController', ['matrixService'])
             $scope.config = matrixService.config();        
         }
     };
+    
+    $scope.closeConfig = function() {
+        if ($scope.config) {
+            $scope.config = undefined;
+        }
+    };
 
-    if (matrixService.config()) {
+    if (matrixService.isUserLoggedIn()) {
         eventStreamService.resume();
     }
     
@@ -69,6 +75,15 @@ angular.module('MatrixWebClientController', ['matrixService'])
         console.log("Invalid access token -> log user out");
         $scope.logout();
     });
+    
+    $scope.requestNotifications = function() {
+        if (window.Notification) {
+            console.log("Notification.permission: " + window.Notification.permission);
+            window.Notification.requestPermission(function(){});
+        }
+    };
+    
+    
 }]);