web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lint compliance

Browse Source
This commit is contained in:
yflory
2017-11-09 17:23:13 +01:00
parent cf5ccf04f2
commit f931574dac
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/migrate-user-object.js
View File

@@ -67,7 +67,7 @@ define([], function () {
// Migration 4: allowUserFeedback to settings // Migration 4: allowUserFeedback to settings
var migrateLanguage = function () { var migrateFeedback = function () {
var settings = userObject.settings = userObject.settings || {}; var settings = userObject.settings = userObject.settings || {};
if (typeof(userObject['allowUserFeedback']) !== "undefined") { if (typeof(userObject['allowUserFeedback']) !== "undefined") {
settings.general = settings.general || {}; settings.general = settings.general || {};
@@ -76,7 +76,7 @@ define([], function () {
} }
}; };
if (version < 4) { if (version < 4) {
migrateLanguage(); migrateFeedback();
Cryptpad.feedback('Migrate-4', true); Cryptpad.feedback('Migrate-4', true);
userObject.version = version = 4; userObject.version = version = 4;
} }

14
www/settings/inner.js
View File

@@ -4,8 +4,8 @@ define([
'/common/cryptpad-common.js', '/common/cryptpad-common.js',
'/bower_components/nthen/index.js', '/bower_components/nthen/index.js',
'/common/sframe-common.js', '/common/sframe-common.js',
'/customize/pages.js',
'/bower_components/file-saver/FileSaver.min.js',
'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
'less!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
'less!/customize/src/less2/main.less', 'less!/customize/src/less2/main.less',
@@ -14,10 +14,10 @@ define([
Toolbar, Toolbar,
Cryptpad, Cryptpad,
nThen, nThen,
SFCommon, SFCommon
Pages
) )
{ {
var saveAs = window.saveAs;
var Messages = Cryptpad.Messages; var Messages = Cryptpad.Messages;
var APP = window.APP = { var APP = window.APP = {
Cryptpad: Cryptpad, Cryptpad: Cryptpad,
@@ -151,7 +151,7 @@ define([
return $div; return $div;
}; };
var createIndentTypeSelector = function (obj) { var createIndentTypeSelector = function () {
var key = 'indentWithTabs'; var key = 'indentWithTabs';
var $div = $('<div>', { var $div = $('<div>', {
@@ -305,7 +305,7 @@ define([
return $div; return $div;
}; };
var createResetDrive = function (obj) { var createResetDrive = function () {
var $div = $('<div>', {'class': 'cp-settings-reset-drive cp-sidebarlayout-element'}); var $div = $('<div>', {'class': 'cp-settings-reset-drive cp-sidebarlayout-element'});
$('<label>').text(Messages.settings_resetNewTitle).appendTo($div); $('<label>').text(Messages.settings_resetNewTitle).appendTo($div);
$('<span>', {'class': 'cp-sidebarlayout-description'}) $('<span>', {'class': 'cp-sidebarlayout-description'})
@@ -397,7 +397,7 @@ define([
$spinner.show(); $spinner.show();
$ok.hide(); $ok.hide();
sframeChan.query('Q_SETTINGS_LOGOUT', null, function (err) { sframeChan.query('Q_SETTINGS_LOGOUT', null, function () {
$spinner.hide(); $spinner.hide();
$ok.show(); $ok.show();
window.setTimeout(function () { window.setTimeout(function () {
@@ -428,7 +428,7 @@ define([
if (!yes) { return; } if (!yes) { return; }
$spinner.show(); $spinner.show();
$ok.hide(); $ok.hide();
sframeChan.query('Q_SETTINGS_IMPORT_LOCAL', null, function (err) { sframeChan.query('Q_SETTINGS_IMPORT_LOCAL', null, function () {
$spinner.hide(); $spinner.hide();
$ok.show(); $ok.show();
Cryptpad.alert(Messages.settings_importDone); Cryptpad.alert(Messages.settings_importDone);

7
www/settings/main.js
View File

@@ -60,7 +60,7 @@ define([
var sjson = JSON.stringify(data); var sjson = JSON.stringify(data);
var k = Cryptpad.getUserHash() || localStorage[Cryptpad.fileHashKey]; var k = Cryptpad.getUserHash() || localStorage[Cryptpad.fileHashKey];
require(['/common/cryptget.js'], function (Crypt) { require(['/common/cryptget.js'], function (Crypt) {
Crypt.put(k, sjson, function (err, data) { Crypt.put(k, sjson, function (err) {
cb(err); cb(err);
}); });
}); });
@@ -80,7 +80,10 @@ define([
Cryptpad.whenRealtimeSyncs(realtime, cb); Cryptpad.whenRealtimeSyncs(realtime, cb);
}); });
sframeChan.on('Q_SETTINGS_IMPORT_LOCAL', function (data, cb) { sframeChan.on('Q_SETTINGS_IMPORT_LOCAL', function (data, cb) {
Merge.anonDriveIntoUser(Cryptpad.getStore().getProxy(), localStorage.FS_hash, cb); var proxyData = Cryptpad.getStore().getProxy();
require(['/common/mergeDrive.js'], function (Merge) {
Merge.anonDriveIntoUser(proxyData, localStorage.FS_hash, cb);
});
}); });
}; };
SFCommonO.start({ SFCommonO.start({