From 311952d4dd6bc0ac3274572ea2c1b9e90a88de6e Mon Sep 17 00:00:00 2001 From: azivner Date: Sun, 1 Apr 2018 17:41:28 -0400 Subject: [PATCH] renamed settings to options for consistency --- .../dialogs/{settings.js => options.js} | 46 +++++++++--------- src/public/javascripts/services/bootstrap.js | 2 +- .../javascripts/services/context_menu.js | 4 +- .../javascripts/services/entrypoints.js | 4 +- src/public/javascripts/services/info.js | 4 +- src/public/javascripts/services/messaging.js | 2 +- .../services/protected_session_holder.js | 2 +- src/public/javascripts/services/tree.js | 2 +- src/routes/api/{settings.js => options.js} | 18 +++---- src/routes/routes.js | 8 +-- src/scripts/Reddit Importer.tar | Bin 10732 -> 10731 bytes src/views/index.ejs | 8 +-- 12 files changed, 50 insertions(+), 50 deletions(-) rename src/public/javascripts/dialogs/{settings.js => options.js} (82%) rename src/routes/api/{settings.js => options.js} (62%) diff --git a/src/public/javascripts/dialogs/settings.js b/src/public/javascripts/dialogs/options.js similarity index 82% rename from src/public/javascripts/dialogs/settings.js rename to src/public/javascripts/dialogs/options.js index 9a6c086f7..f577d7948 100644 --- a/src/public/javascripts/dialogs/settings.js +++ b/src/public/javascripts/dialogs/options.js @@ -5,8 +5,8 @@ import utils from '../services/utils.js'; import server from '../services/server.js'; import infoService from "../services/info.js"; -const $dialog = $("#settings-dialog"); -const $tabs = $("#settings-tabs"); +const $dialog = $("#options-dialog"); +const $tabs = $("#options-tabs"); const tabHandlers = []; @@ -17,7 +17,7 @@ function addTabHandler(handler) { async function showDialog() { glob.activeDialog = $dialog; - const settings = await server.get('settings'); + const options = await server.get('options'); $dialog.dialog({ modal: true, @@ -27,24 +27,24 @@ async function showDialog() { $tabs.tabs(); for (const handler of tabHandlers) { - if (handler.settingsLoaded) { - handler.settingsLoaded(settings); + if (handler.optionsLoaded) { + handler.optionsLoaded(options); } } } -async function saveSettings(settingName, settingValue) { - await server.post('settings', { - name: settingName, - value: settingValue +async function saveOptions(optionName, optionValue) { + await server.post('options', { + name: optionName, + value: optionValue }); - infoService.showMessage("Settings change have been saved."); + infoService.showMessage("Options change have been saved."); } export default { showDialog, - saveSettings + saveOptions }; addTabHandler((function() { @@ -53,7 +53,7 @@ addTabHandler((function() { const $newPassword1 = $("#new-password1"); const $newPassword2 = $("#new-password2"); - function settingsLoaded(settings) { + function optionsLoaded(options) { } $form.submit(() => { @@ -89,23 +89,23 @@ addTabHandler((function() { }); return { - settingsLoaded + optionsLoaded }; })()); addTabHandler((function() { const $form = $("#protected-session-timeout-form"); const $protectedSessionTimeout = $("#protected-session-timeout-in-seconds"); - const settingName = 'protected_session_timeout'; + const optionName = 'protected_session_timeout'; - function settingsLoaded(settings) { - $protectedSessionTimeout.val(settings[settingName]); + function optionsLoaded(options) { + $protectedSessionTimeout.val(options[optionName]); } $form.submit(() => { const protectedSessionTimeout = $protectedSessionTimeout.val(); - saveSettings(settingName, protectedSessionTimeout).then(() => { + saveOptions(optionName, protectedSessionTimeout).then(() => { protectedSessionHolder.setProtectedSessionTimeout(protectedSessionTimeout); }); @@ -113,27 +113,27 @@ addTabHandler((function() { }); return { - settingsLoaded + optionsLoaded }; })()); addTabHandler((function () { const $form = $("#note-revision-snapshot-time-interval-form"); const $timeInterval = $("#note-revision-snapshot-time-interval-in-seconds"); - const settingName = 'note_revision_snapshot_time_interval'; + const optionName = 'note_revision_snapshot_time_interval'; - function settingsLoaded(settings) { - $timeInterval.val(settings[settingName]); + function optionsLoaded(options) { + $timeInterval.val(options[optionName]); } $form.submit(() => { - saveSettings(settingName, $timeInterval.val()); + saveOptions(optionName, $timeInterval.val()); return false; }); return { - settingsLoaded + optionsLoaded }; })()); diff --git a/src/public/javascripts/services/bootstrap.js b/src/public/javascripts/services/bootstrap.js index f29a2a5cb..d40d897ef 100644 --- a/src/public/javascripts/services/bootstrap.js +++ b/src/public/javascripts/services/bootstrap.js @@ -5,7 +5,7 @@ import noteRevisionsDialog from '../dialogs/note_revisions.js'; import noteSourceDialog from '../dialogs/note_source.js'; import recentChangesDialog from '../dialogs/recent_changes.js'; import recentNotesDialog from '../dialogs/recent_notes.js'; -import settingsDialog from '../dialogs/settings.js'; +import optionsDialog from '../dialogs/options.js'; import sqlConsoleDialog from '../dialogs/sql_console.js'; import cloning from './cloning.js'; diff --git a/src/public/javascripts/services/context_menu.js b/src/public/javascripts/services/context_menu.js index f15acd69e..390a8ad9e 100644 --- a/src/public/javascripts/services/context_menu.js +++ b/src/public/javascripts/services/context_menu.js @@ -76,7 +76,7 @@ function cut(nodes) { infoService.showMessage("Note(s) have been cut into clipboard."); } -const contextMenuSettings = { +const contextMenuOptions = { delegate: "span.fancytree-title", autoFocus: true, menu: [ @@ -185,5 +185,5 @@ export default { pasteInto, cut, copy, - contextMenuSettings + contextMenuOptions }; \ No newline at end of file diff --git a/src/public/javascripts/services/entrypoints.js b/src/public/javascripts/services/entrypoints.js index 8ffe1a6f8..a2a7b2abd 100644 --- a/src/public/javascripts/services/entrypoints.js +++ b/src/public/javascripts/services/entrypoints.js @@ -3,7 +3,7 @@ import treeService from "./tree.js"; import linkService from "./link.js"; import fileService from "./file.js"; import noteRevisionsDialog from "../dialogs/note_revisions.js"; -import settingsDialog from "../dialogs/settings.js"; +import optionsDialog from "../dialogs/options.js"; import addLinkDialog from "../dialogs/add_link.js"; import recentNotesDialog from "../dialogs/recent_notes.js"; import jumpToNoteDialog from "../dialogs/jump_to_note.js"; @@ -40,7 +40,7 @@ function registerEntrypoints() { $(".show-labels-button").click(labelsDialog.showDialog); utils.bindShortcut('alt+l', labelsDialog.showDialog); - $("#settings-button").click(settingsDialog.showDialog); + $("#options-button").click(optionsDialog.showDialog); utils.bindShortcut('alt+o', sqlConsoleDialog.showDialog); diff --git a/src/public/javascripts/services/info.js b/src/public/javascripts/services/info.js index 48ab4eae4..91e1ef261 100644 --- a/src/public/javascripts/services/info.js +++ b/src/public/javascripts/services/info.js @@ -8,7 +8,7 @@ function showMessage(message) { // options message: message }, { - // settings + // options type: 'success', delay: 3000 }); @@ -21,7 +21,7 @@ function showError(message, delay = 10000) { // options message: message }, { - // settings + // options type: 'danger', delay: delay }); diff --git a/src/public/javascripts/services/messaging.js b/src/public/javascripts/services/messaging.js index b40f7a376..64dc42b8f 100644 --- a/src/public/javascripts/services/messaging.js +++ b/src/public/javascripts/services/messaging.js @@ -82,7 +82,7 @@ setTimeout(() => { // options message: "Lost connection to server" },{ - // settings + // options type: 'danger', delay: 100000000 // keep it until we explicitly close it }); diff --git a/src/public/javascripts/services/protected_session_holder.js b/src/public/javascripts/services/protected_session_holder.js index 9d5595c70..66b9cd839 100644 --- a/src/public/javascripts/services/protected_session_holder.js +++ b/src/public/javascripts/services/protected_session_holder.js @@ -6,7 +6,7 @@ let protectedSessionTimeout = null; let protectedSessionId = null; $(document).ready(() => { - server.get('settings/all').then(settings => protectedSessionTimeout = settings.protected_session_timeout); + server.get('options/all').then(options => protectedSessionTimeout = options.protected_session_timeout); }); setInterval(() => { diff --git a/src/public/javascripts/services/tree.js b/src/public/javascripts/services/tree.js index a32a50ace..a89afcaea 100644 --- a/src/public/javascripts/services/tree.js +++ b/src/public/javascripts/services/tree.js @@ -349,7 +349,7 @@ function initFancyTree(branch) { } }); - $tree.contextmenu(contextMenuService.contextMenuSettings); + $tree.contextmenu(contextMenuService.contextMenuOptions); } function getTree() { diff --git a/src/routes/api/settings.js b/src/routes/api/options.js similarity index 62% rename from src/routes/api/settings.js rename to src/routes/api/options.js index 8659df0cc..29ec7a715 100644 --- a/src/routes/api/settings.js +++ b/src/routes/api/options.js @@ -3,21 +3,21 @@ const sql = require('../../services/sql'); const options = require('../../services/options'); -// options allowed to be updated directly in settings dialog +// options allowed to be updated directly in options dialog const ALLOWED_OPTIONS = ['protected_session_timeout', 'note_revision_snapshot_time_interval']; -async function getAllSettings() { +async function getAllOptions() { return await sql.getMap("SELECT name, value FROM options"); } -async function getAllowedSettings() { - const settings = await sql.getMap("SELECT name, value FROM options WHERE name IN (" +async function getAllowedOptions() { + const options = await sql.getMap("SELECT name, value FROM options WHERE name IN (" + ALLOWED_OPTIONS.map(x => '?').join(",") + ")", ALLOWED_OPTIONS); - return settings; + return options; } -async function updateSetting(req) { +async function updateOption(req) { const body = req.body; if (!ALLOWED_OPTIONS.includes(body['name'])) { @@ -28,7 +28,7 @@ async function updateSetting(req) { } module.exports = { - getAllowedSettings, - getAllSettings, - updateSetting + getAllowedOptions, + getAllOptions, + updateOption }; \ No newline at end of file diff --git a/src/routes/routes.js b/src/routes/routes.js index 441089f76..2d1eb5de9 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -11,7 +11,7 @@ const treeChangesApiRoute = require('./api/tree_changes'); const cloningApiRoute = require('./api/cloning'); const noteRevisionsApiRoute = require('./api/note_revisions'); const recentChangesApiRoute = require('./api/recent_changes'); -const settingsApiRoute = require('./api/settings'); +const optionsApiRoute = require('./api/options'); const passwordApiRoute = require('./api/password'); const migrationApiRoute = require('./api/migration'); const syncApiRoute = require('./api/sync'); @@ -126,9 +126,9 @@ function register(app) { apiRoute(GET, '/api/recent-changes', recentChangesApiRoute.getRecentChanges); - apiRoute(GET, '/api/settings', settingsApiRoute.getAllowedSettings); - apiRoute(GET, '/api/settings/all', settingsApiRoute.getAllSettings); - apiRoute(POST, '/api/settings', settingsApiRoute.updateSetting); + apiRoute(GET, '/api/options', optionsApiRoute.getAllowedOptions); + apiRoute(GET, '/api/options/all', optionsApiRoute.getAllOptions); + apiRoute(POST, '/api/options', optionsApiRoute.updateOption); apiRoute(POST, '/api/password/change', passwordApiRoute.changePassword); diff --git a/src/scripts/Reddit Importer.tar b/src/scripts/Reddit Importer.tar index ca6170ed271d0dbf29c8af4181328d990a8db244..24ff66938fa7ef5198c552a341537518fbe594fe 100644 GIT binary patch delta 19 acmaD8{5p6;4jWs3K}lwQ-sWPqN@W09mIwy` delta 20 bcmaDI{3duq4jX%MYDr0EUi#)Dwn}9HVlW77 diff --git a/src/views/index.ejs b/src/views/index.ejs index c21fb3ff3..c59afbf21 100644 --- a/src/views/index.ejs +++ b/src/views/index.ejs @@ -29,8 +29,8 @@ Sync now (0) - +
@@ -272,8 +272,8 @@
-