Remove settings view
Mikunj
5 years ago
parent
4e5f6bc846
commit
eeb6257526
@ -1,58 +0,0 @@
|
||||
/* global $, Whisper, storage */
|
||||
|
||||
$(document).on('keyup', e => {
|
||||
'use strict';
|
||||
|
||||
if (e.keyCode === 27) {
|
||||
window.closeSettings();
|
||||
}
|
||||
});
|
||||
|
||||
const $body = $(document.body);
|
||||
$body.addClass(`${window.theme}-theme`);
|
||||
|
||||
// eslint-disable-next-line strict
|
||||
const getInitialData = async () => ({
|
||||
deviceName: await window.getDeviceName(),
|
||||
|
||||
themeSetting: await window.getThemeSetting(),
|
||||
hideMenuBar: await window.getHideMenuBar(),
|
||||
|
||||
messageTTL: await window.getMessageTTL(),
|
||||
readReceiptSetting: await window.getReadReceiptSetting(),
|
||||
typingIndicatorsSetting: await window.getTypingIndicatorsSetting(),
|
||||
linkPreviewSetting: await window.getLinkPreviewSetting(),
|
||||
notificationSetting: await window.getNotificationSetting(),
|
||||
audioNotification: await window.getAudioNotification(),
|
||||
|
||||
spellCheck: await window.getSpellCheck(),
|
||||
|
||||
mediaPermissions: await window.getMediaPermissions(),
|
||||
|
||||
isPrimary: await window.isPrimary(),
|
||||
lastSyncTime: await window.getLastSyncTime(),
|
||||
});
|
||||
|
||||
window.initialRequest = getInitialData();
|
||||
|
||||
// eslint-disable-next-line more/no-then
|
||||
window.initialRequest.then(
|
||||
data => {
|
||||
'use strict';
|
||||
|
||||
storage.fetch();
|
||||
|
||||
window.initialData = data;
|
||||
window.view = new Whisper.SettingsView();
|
||||
window.view.$el.appendTo($body);
|
||||
},
|
||||
error => {
|
||||
'use strict';
|
||||
|
||||
window.log.error(
|
||||
'settings.initialRequest error:',
|
||||
error && error.stack ? error.stack : error
|
||||
);
|
||||
window.closeSettings();
|
||||
}
|
||||
);
|
||||
@ -1,327 +0,0 @@
|
||||
/* global i18n: false */
|
||||
/* global Whisper: false */
|
||||
/* global $: false */
|
||||
|
||||
/* eslint-disable no-new */
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
window.Whisper = window.Whisper || {};
|
||||
const { Settings } = window.Signal.Types;
|
||||
|
||||
const CheckboxView = Whisper.View.extend({
|
||||
initialize(options) {
|
||||
this.name = options.name;
|
||||
this.setFn = options.setFn;
|
||||
this.value = options.value;
|
||||
this.populate();
|
||||
},
|
||||
events: {
|
||||
change: 'change',
|
||||
},
|
||||
change(e) {
|
||||
const value = e.target.checked;
|
||||
this.setFn(value);
|
||||
window.log.info(this.name, 'changed to', value);
|
||||
},
|
||||
populate() {
|
||||
this.$('input').prop('checked', !!this.value);
|
||||
},
|
||||
});
|
||||
|
||||
const MediaPermissionsSettingView = Whisper.View.extend({
|
||||
initialize(options) {
|
||||
this.value = options.value;
|
||||
this.setFn = options.setFn;
|
||||
this.populate();
|
||||
},
|
||||
events: {
|
||||
change: 'change',
|
||||
},
|
||||
change(e) {
|
||||
this.value = e.target.checked;
|
||||
this.setFn(this.value);
|
||||
window.log.info('media-permissions changed to', this.value);
|
||||
},
|
||||
populate() {
|
||||
this.$('input').prop('checked', Boolean(this.value));
|
||||
},
|
||||
});
|
||||
|
||||
const MessageTTLSettingView = Whisper.View.extend({
|
||||
initialize(options) {
|
||||
this.value = options.value;
|
||||
this.setFn = options.setFn;
|
||||
this.populate();
|
||||
},
|
||||
events: {
|
||||
change: 'change',
|
||||
input: 'input',
|
||||
},
|
||||
change(e) {
|
||||
this.value = e.target.value;
|
||||
this.setFn(this.value);
|
||||
window.log.info('message-ttl-setting changed to', this.value);
|
||||
},
|
||||
input(e) {
|
||||
this.value = e.target.value;
|
||||
this.$('label').html(`${this.value} Hours`);
|
||||
},
|
||||
populate() {
|
||||
this.$('input').val(this.value);
|
||||
this.$('label').html(`${this.value} Hours`);
|
||||
},
|
||||
});
|
||||
|
||||
const ReadReceiptSettingView = Whisper.View.extend({
|
||||
initialize(options) {
|
||||
this.value = options.value;
|
||||
this.setFn = options.setFn;
|
||||
this.populate();
|
||||
},
|
||||
events: {
|
||||
change: 'change',
|
||||
},
|
||||
change(e) {
|
||||
this.value = e.target.checked;
|
||||
this.setFn(this.value);
|
||||
window.log.info('read-receipt-setting changed to', this.value);
|
||||
},
|
||||
populate() {
|
||||
this.$('input').prop('checked', Boolean(this.value));
|
||||
},
|
||||
});
|
||||
|
||||
const TypingIndicatorsSettingView = Whisper.View.extend({
|
||||
initialize(options) {
|
||||
this.value = options.value;
|
||||
this.setFn = options.setFn;
|
||||
this.populate();
|
||||
},
|
||||
events: {
|
||||
change: 'change',
|
||||
},
|
||||
change(e) {
|
||||
this.value = e.target.checked;
|
||||
this.setFn(this.value);
|
||||
window.log.info('typing-indicators-setting changed to', this.value);
|
||||
},
|
||||
populate() {
|
||||
this.$('input').prop('checked', Boolean(this.value));
|
||||
},
|
||||
});
|
||||
|
||||
const RadioButtonGroupView = Whisper.View.extend({
|
||||
initialize(options) {
|
||||
this.name = options.name;
|
||||
this.setFn = options.setFn;
|
||||
this.value = options.value;
|
||||
this.populate();
|
||||
},
|
||||
events: {
|
||||
change: 'change',
|
||||
},
|
||||
change(e) {
|
||||
const value = this.$(e.target).val();
|
||||
this.setFn(value);
|
||||
window.log.info(this.name, 'changed to', value);
|
||||
},
|
||||
populate() {
|
||||
this.$(`#${this.name}-${this.value}`).attr('checked', 'checked');
|
||||
},
|
||||
});
|
||||
Whisper.SettingsView = Whisper.View.extend({
|
||||
className: 'settings modal expand',
|
||||
templateName: 'settings',
|
||||
initialize() {
|
||||
this.render();
|
||||
new RadioButtonGroupView({
|
||||
el: this.$('.notification-settings'),
|
||||
name: 'notification-setting',
|
||||
value: window.initialData.notificationSetting,
|
||||
setFn: window.setNotificationSetting,
|
||||
});
|
||||
new RadioButtonGroupView({
|
||||
el: this.$('.theme-settings'),
|
||||
name: 'theme-setting',
|
||||
value: window.initialData.themeSetting,
|
||||
setFn: theme => {
|
||||
$(document.body)
|
||||
.removeClass('dark-theme')
|
||||
.removeClass('light-theme')
|
||||
.addClass(`${theme}-theme`);
|
||||
window.setThemeSetting(theme);
|
||||
},
|
||||
});
|
||||
if (Settings.isAudioNotificationSupported()) {
|
||||
new CheckboxView({
|
||||
el: this.$('.audio-notification-setting'),
|
||||
name: 'audio-notification-setting',
|
||||
value: window.initialData.audioNotification,
|
||||
setFn: window.setAudioNotification,
|
||||
});
|
||||
}
|
||||
new CheckboxView({
|
||||
el: this.$('.spell-check-setting'),
|
||||
name: 'spell-check-setting',
|
||||
value: window.initialData.spellCheck,
|
||||
setFn: window.setSpellCheck,
|
||||
});
|
||||
if (Settings.isHideMenuBarSupported()) {
|
||||
new CheckboxView({
|
||||
el: this.$('.menu-bar-setting'),
|
||||
name: 'menu-bar-setting',
|
||||
value: window.initialData.hideMenuBar,
|
||||
setFn: window.setHideMenuBar,
|
||||
});
|
||||
}
|
||||
new CheckboxView({
|
||||
el: this.$('.link-preview-setting'),
|
||||
name: 'link-preview-setting',
|
||||
value: window.initialData.linkPreviewSetting,
|
||||
setFn: window.setLinkPreviewSetting,
|
||||
});
|
||||
new MediaPermissionsSettingView({
|
||||
el: this.$('.media-permissions'),
|
||||
value: window.initialData.mediaPermissions,
|
||||
setFn: window.setMediaPermissions,
|
||||
});
|
||||
new ReadReceiptSettingView({
|
||||
el: this.$('.read-receipt-setting'),
|
||||
value: window.initialData.readReceiptSetting,
|
||||
setFn: window.setReadReceiptSetting,
|
||||
});
|
||||
new TypingIndicatorsSettingView({
|
||||
el: this.$('.typing-indicators-setting'),
|
||||
value: window.initialData.typingIndicatorsSetting,
|
||||
setFn: window.setTypingIndicatorsSetting,
|
||||
});
|
||||
new MessageTTLSettingView({
|
||||
el: this.$('.message-ttl-setting'),
|
||||
value: window.initialData.messageTTL,
|
||||
setFn: window.setMessageTTL,
|
||||
});
|
||||
const blockedNumberView = new Whisper.BlockedNumberView().render();
|
||||
this.$('.blocked-user-setting').append(blockedNumberView.el);
|
||||
|
||||
if (!window.initialData.isPrimary) {
|
||||
const syncView = new SyncView().render();
|
||||
this.$('.sync-setting').append(syncView.el);
|
||||
}
|
||||
},
|
||||
events: {
|
||||
'click .close': 'onClose',
|
||||
'click .clear-data': 'onClearData',
|
||||
},
|
||||
render_attributes() {
|
||||
return {
|
||||
deviceNameLabel: i18n('deviceName'),
|
||||
deviceName: window.initialData.deviceName,
|
||||
theme: i18n('theme'),
|
||||
notifications: i18n('notifications'),
|
||||
notificationSettingsDialog: i18n('notificationSettingsDialog'),
|
||||
settings: i18n('settings'),
|
||||
disableNotifications: i18n('disableNotifications'),
|
||||
nameAndMessage: i18n('nameAndMessage'),
|
||||
noNameOrMessage: i18n('noNameOrMessage'),
|
||||
nameOnly: i18n('nameOnly'),
|
||||
audioNotificationDescription: i18n('audioNotificationDescription'),
|
||||
isAudioNotificationSupported: Settings.isAudioNotificationSupported(),
|
||||
isHideMenuBarSupported: Settings.isHideMenuBarSupported(),
|
||||
themeLight: i18n('themeLight'),
|
||||
themeDark: i18n('themeDark'),
|
||||
hideMenuBar: i18n('hideMenuBar'),
|
||||
clearDataHeader: i18n('clearDataHeader'),
|
||||
clearDataButton: i18n('clearDataButton'),
|
||||
clearDataExplanation: i18n('clearDataExplanation'),
|
||||
permissions: i18n('permissions'),
|
||||
mediaPermissionsDescription: i18n('mediaPermissionsDescription'),
|
||||
generalHeader: i18n('general'),
|
||||
readReceiptSettingDescription: i18n('readReceiptSettingDescription'),
|
||||
typingIndicatorsSettingDescription: i18n(
|
||||
'typingIndicatorsSettingDescription'
|
||||
),
|
||||
messageTTL: i18n('messageTTL'),
|
||||
messageTTLSettingDescription: i18n('messageTTLSettingDescription'),
|
||||
messageTTLSettingWarning: i18n('messageTTLSettingWarning'),
|
||||
spellCheckHeader: i18n('spellCheck'),
|
||||
spellCheckDescription: i18n('spellCheckDescription'),
|
||||
blockedHeader: 'Blocked Users',
|
||||
linkPreviews: i18n('linkPreviewsTitle'),
|
||||
linkPreviewsSettingDescription: i18n('linkPreviewsDescription'),
|
||||
};
|
||||
},
|
||||
onClose() {
|
||||
window.closeSettings();
|
||||
},
|
||||
onClearData() {
|
||||
window.deleteAllData();
|
||||
window.closeSettings();
|
||||
},
|
||||
});
|
||||
|
||||
const SyncView = Whisper.View.extend({
|
||||
templateName: 'syncSettings',
|
||||
className: 'syncSettings',
|
||||
events: {
|
||||
'click .sync': 'sync',
|
||||
},
|
||||
initialize() {
|
||||
this.lastSyncTime = window.initialData.lastSyncTime;
|
||||
},
|
||||
enable() {
|
||||
this.$('.sync').text(i18n('syncNow'));
|
||||
this.$('.sync').removeAttr('disabled');
|
||||
},
|
||||
disable() {
|
||||
this.$('.sync').attr('disabled', 'disabled');
|
||||
this.$('.sync').text(i18n('syncing'));
|
||||
},
|
||||
onsuccess() {
|
||||
window.setLastSyncTime(Date.now());
|
||||
this.lastSyncTime = Date.now();
|
||||
window.log.info('sync successful');
|
||||
this.enable();
|
||||
this.render();
|
||||
},
|
||||
ontimeout() {
|
||||
window.log.error('sync timed out');
|
||||
this.$('.synced_at').hide();
|
||||
this.$('.sync_failed').show();
|
||||
this.enable();
|
||||
},
|
||||
async sync() {
|
||||
this.$('.sync_failed').hide();
|
||||
if (window.initialData.isPrimary) {
|
||||
window.log.warn('Tried to sync from device 1');
|
||||
return;
|
||||
}
|
||||
|
||||
this.disable();
|
||||
try {
|
||||
await window.makeSyncRequest();
|
||||
this.onsuccess();
|
||||
} catch (error) {
|
||||
this.ontimeout();
|
||||
}
|
||||
},
|
||||
render_attributes() {
|
||||
const attrs = {
|
||||
sync: i18n('sync'),
|
||||
syncNow: i18n('syncNow'),
|
||||
syncExplanation: i18n('syncExplanation'),
|
||||
syncFailed: i18n('syncFailed'),
|
||||
};
|
||||
let date = this.lastSyncTime;
|
||||
if (date) {
|
||||
date = new Date(date);
|
||||
attrs.lastSynced = i18n('lastSynced');
|
||||
attrs.syncDate = date.toLocaleDateString();
|
||||
attrs.syncTime = date.toLocaleTimeString();
|
||||
}
|
||||
return attrs;
|
||||
},
|
||||
});
|
||||
})();
|
||||
@ -1,100 +0,0 @@
|
||||
/* global window */
|
||||
|
||||
const { ipcRenderer } = require('electron');
|
||||
const url = require('url');
|
||||
const i18n = require('./js/modules/i18n');
|
||||
|
||||
const config = url.parse(window.location.toString(), true).query;
|
||||
const { locale } = config;
|
||||
const localeMessages = ipcRenderer.sendSync('locale-data');
|
||||
|
||||
window.theme = config.theme;
|
||||
window.i18n = i18n.setup(locale, localeMessages);
|
||||
|
||||
window.getEnvironment = () => config.environment;
|
||||
window.getVersion = () => config.version;
|
||||
window.getAppInstance = () => config.appInstance;
|
||||
|
||||
// So far we're only using this for Signal.Types
|
||||
const Signal = require('./js/modules/signal');
|
||||
|
||||
window.Signal = Signal.setup({
|
||||
Attachments: null,
|
||||
userDataPath: null,
|
||||
getRegionCode: () => null,
|
||||
});
|
||||
|
||||
window.closeSettings = () => ipcRenderer.send('close-settings');
|
||||
|
||||
// Events for updating block number states across different windows.
|
||||
// In this case we need these to update the blocked number
|
||||
// collection on the main window from the settings window.
|
||||
window.onUnblockNumber = number =>
|
||||
ipcRenderer.send('on-unblock-number', number);
|
||||
|
||||
window.getDeviceName = makeGetter('device-name');
|
||||
|
||||
window.getThemeSetting = makeGetter('theme-setting');
|
||||
window.setThemeSetting = makeSetter('theme-setting');
|
||||
window.getHideMenuBar = makeGetter('hide-menu-bar');
|
||||
window.setHideMenuBar = makeSetter('hide-menu-bar');
|
||||
|
||||
window.getSpellCheck = makeGetter('spell-check');
|
||||
window.setSpellCheck = makeSetter('spell-check');
|
||||
|
||||
window.getMessageTTL = makeGetter('message-ttl');
|
||||
window.setMessageTTL = makeSetter('message-ttl');
|
||||
|
||||
window.getReadReceiptSetting = makeGetter('read-receipt-setting');
|
||||
window.setReadReceiptSetting = makeSetter('read-receipt-setting');
|
||||
|
||||
window.getTypingIndicatorsSetting = makeGetter('typing-indicators-setting');
|
||||
window.setTypingIndicatorsSetting = makeSetter('typing-indicators-setting');
|
||||
|
||||
window.getNotificationSetting = makeGetter('notification-setting');
|
||||
window.setNotificationSetting = makeSetter('notification-setting');
|
||||
window.getAudioNotification = makeGetter('audio-notification');
|
||||
window.setAudioNotification = makeSetter('audio-notification');
|
||||
|
||||
window.getLinkPreviewSetting = makeGetter('link-preview-setting');
|
||||
window.setLinkPreviewSetting = makeSetter('link-preview-setting');
|
||||
|
||||
window.getMediaPermissions = makeGetter('media-permissions');
|
||||
window.setMediaPermissions = makeSetter('media-permissions');
|
||||
|
||||
window.isPrimary = makeGetter('is-primary');
|
||||
window.makeSyncRequest = makeGetter('sync-request');
|
||||
window.getLastSyncTime = makeGetter('sync-time');
|
||||
window.setLastSyncTime = makeSetter('sync-time');
|
||||
|
||||
window.deleteAllData = () => ipcRenderer.send('delete-all-data');
|
||||
|
||||
function makeGetter(name) {
|
||||
return () =>
|
||||
new Promise((resolve, reject) => {
|
||||
ipcRenderer.once(`get-success-${name}`, (event, error, value) => {
|
||||
if (error) {
|
||||
return reject(error);
|
||||
}
|
||||
|
||||
return resolve(value);
|
||||
});
|
||||
ipcRenderer.send(`get-${name}`);
|
||||
});
|
||||
}
|
||||
|
||||
function makeSetter(name) {
|
||||
return value =>
|
||||
new Promise((resolve, reject) => {
|
||||
ipcRenderer.once(`set-success-${name}`, (event, error) => {
|
||||
if (error) {
|
||||
return reject(error);
|
||||
}
|
||||
|
||||
return resolve();
|
||||
});
|
||||
ipcRenderer.send(`set-${name}`, value);
|
||||
});
|
||||
}
|
||||
|
||||
require('./js/logging');
|
||||
Loading…
Reference in New Issue