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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
yflory 2017-02-27 17:23:40 +01:00
parent f8d653406a d15a08830e
commit 20518a3e88
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
customize.dist/fsStore.js
View File

@ -135,6 +135,11 @@ define([
if (typeof(f) === 'function') {
f(void 0, store);
}
if (typeof(proxy.allowUserFeedback) !== 'boolean') {
proxy.allowUserFeedback = true;
}
proxy.on('change', [Cryptpad.displayNameKey], function (o, n, p) {
if (typeof(n) !== "string") { return; }
Cryptpad.changeDisplayName(n);

1
customize.dist/translations/messages.js
View File

@ -255,6 +255,7 @@ define(function () {
out.settings_resetTips = "Tips in CryptDrive";
out.settings_resetTipsButton = "Reset the available tips in CryptDrive";
out.settings_resetTipsDone = "All the tips are now visible again.";
out.settings_userFeedback = "disable user feedback";
// index.html

29
www/settings/main.js
View File

@ -95,7 +95,7 @@ define([
return $div;
};
var createResetTips = function () {
var createResetTips = function () {
var $div = $('<div>', {'class': 'resetTips'});
var $label = $('<label>', {'for' : 'resetTips'}).text(Messages.settings_resetTips).appendTo($div);
$('<br>').appendTo($div);
@ -112,7 +112,7 @@ define([
});
return $div;
};
};
var createBackupDrive = function (store) {
var obj = store.proxy;
var $div = $('<div>', {'class': 'backupDrive'});
@ -168,6 +168,30 @@ define([
return $div;
};
var createUserFeedbackToggle = function (obj) {
var $div = $('<div>', { 'class': 'userFeedback', });
var $label = $('<label>', { 'for': 'userFeedback'})
.text(Messages.settings_userFeedback);
$('<br>').appendTo($div);
var $checkbox = $('<input>', {
'type': 'checkbox',
}).on('change', function () {
obj.proxy.allowUserFeedback = $checkbox.is(':checked') || false;
console.log("wut");
console.log($box.is(':checked'));
});
$checkbox.appendTo($div);
$label.appendTo($div);
if (obj.proxy.allowUserFeedback) {
$checkbox[0].checked = true;
}
return $div;
};
var andThen = function (obj) {
APP.$container.append(createTitle());
APP.$container.append(createInfoBlock(obj));
@ -175,6 +199,7 @@ define([
APP.$container.append(createResetTips());
APP.$container.append(createBackupDrive(obj));
APP.$container.append(createResetDrive(obj));
APP.$container.append(createUserFeedbackToggle(obj));
obj.proxy.on('change', [], refresh);
obj.proxy.on('remove', [], refresh);
};