infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

inform users of changes in /pad/ too

pull/1/head
ansuz 2016-07-06 22:19:22 +02:00
parent 1ae212af44
commit 85702f2706
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
www/pad/main.js
View File

@ -12,12 +12,15 @@ define([
'json.sortify',
'/bower_components/textpatcher/TextPatcher.amd.js',
'/common/cryptpad-common.js',
'/common/visible.js',
'/common/notify.js',
'/bower_components/file-saver/FileSaver.min.js',
'/bower_components/diff-dom/diffDOM.js',
'/bower_components/jquery/dist/jquery.min.js',
'/customize/pad.js'
], function (Config, Messages, Crypto, realtimeInput, Hyperjson,
Toolbar, Cursor, JsonOT, TypingTest, JSONSortify, TextPatcher, Cryptpad) {
Toolbar, Cursor, JsonOT, TypingTest, JSONSortify, TextPatcher, Cryptpad,
Visible, Notify) {
var $ = window.jQuery;
var saveAs = window.saveAs;
@ -314,6 +317,20 @@ define([
}
};
var unnotify = function () {
if (module.tabNotification &&
typeof(module.tabNotification.cancel) === 'function') {
module.tabNotification.cancel();
}
};
var notify = function () {
if (Visible.isSupported() && !Visible.currently()) {
unnotify();
module.tabNotification = Notify.tab(document.title, 1000, 10);
}
};
var onRemote = realtimeOptions.onRemote = function (info) {
if (initializing) { return; }
@ -356,6 +373,7 @@ define([
}
}
}
notify();
};
var getHTML = function (Dom) {
@ -470,6 +488,12 @@ define([
var shjson = info.realtime.getUserDoc();
applyHjson(shjson);
if (Visible.isSupported()) {
Visible.onChange(function (yes) {
if (yes) { unnotify(); }
});
}
console.log("Unlocking editor");
setEditable(true);
initializing = false;