Added a section on bing words if you enable desktop notifications.

This commit is contained in:
Kegan Dougal 2014-09-16 14:20:26 +01:00
parent 84372cef4a
commit b170fe921e
3 changed files with 19 additions and 2 deletions

View File

@ -139,7 +139,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
if (isLive && event.room_id === $scope.room_id) { if (isLive && event.room_id === $scope.room_id) {
scrollToBottom(); scrollToBottom();
if (window.Notification) { if (window.Notification) {
// Show notification when the window is hidden, or the user is idle // Show notification when the window is hidden, or the user is idle
if (document.hidden || matrixService.presence.unavailable === mPresence.getState()) { if (document.hidden || matrixService.presence.unavailable === mPresence.getState()) {

View File

@ -194,7 +194,16 @@ angular.module('SettingsController', ['matrixService', 'mFileUpload', 'mFileInpu
/*** Desktop notifications section ***/ /*** Desktop notifications section ***/
$scope.settings = { $scope.settings = {
notifications: undefined notifications: undefined,
bingWords: matrixService.config().bingWords
};
$scope.saveBingWords = function() {
console.log("Saving words: "+JSON.stringify($scope.settings.bingWords));
var config = matrixService.config();
config.bingWords = $scope.settings.bingWords;
matrixService.setConfig(config);
matrixService.saveConfig();
}; };
// If the browser supports it, check the desktop notification state // If the browser supports it, check the desktop notification state

View File

@ -52,6 +52,14 @@
<div class="section" ng-switch="settings.notifications"> <div class="section" ng-switch="settings.notifications">
<div ng-switch-when="granted"> <div ng-switch-when="granted">
Notifications are enabled. Notifications are enabled.
<div class="section">
<h4>Words to alert on:</h4>
<input size=40 name="bingWords" ng-model="settings.bingWords" ng-list placeholder="Enter words separated with ,"
ng-blur="saveBingWords()"/>
<ul>
<li ng-repeat="word in settings.bingWords">{{word}}</li>
</ul>
</div>
</div> </div>
<div ng-switch-when="denied"> <div ng-switch-when="denied">
You have denied permission for notifications.<br/> You have denied permission for notifications.<br/>