reduced dependencies of utils

This commit is contained in:
azivner
2018-03-25 21:29:35 -04:00
parent ac1b06967f
commit d3316cd09c
17 changed files with 93 additions and 85 deletions

View File

@@ -1,6 +1,7 @@
import noteDetailService from '../services/note_detail.js';
import utils from '../services/utils.js';
import server from '../services/server.js';
import infoService from "../services/info.js";
const $dialog = $("#labels-dialog");
const $saveLabelsButton = $("#save-labels-button");
@@ -91,7 +92,7 @@ function LabelsModel() {
addLastEmptyRow();
utils.showMessage("Labels have been saved.");
infoService.showMessage("Labels have been saved.");
noteDetailService.loadLabelList();
};

View File

@@ -1,7 +1,7 @@
import treeService from '../services/tree.js';
import messagingService from '../services/messaging.js';
import server from '../services/server.js';
import utils from "../services/utils";
import utils from "../services/utils.js";
const $dialog = $("#recent-notes-dialog");
const $searchInput = $('#recent-notes-search-input');

View File

@@ -3,6 +3,7 @@
import protectedSessionHolder from '../services/protected_session_holder.js';
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");
@@ -38,7 +39,7 @@ async function saveSettings(settingName, settingValue) {
value: settingValue
});
utils.showMessage("Settings change have been saved.");
infoService.showMessage("Settings change have been saved.");
}
export default {
@@ -80,7 +81,7 @@ addModule((function() {
protectedSessionHolder.resetProtectedSession();
}
else {
utils.showError(result.message);
infoService.showError(result.message);
}
});
@@ -164,27 +165,27 @@ addModule((async function () {
$forceFullSyncButton.click(async () => {
await server.post('sync/force-full-sync');
utils.showMessage("Full sync triggered");
infoService.showMessage("Full sync triggered");
});
$fillSyncRowsButton.click(async () => {
await server.post('sync/fill-sync-rows');
utils.showMessage("Sync rows filled successfully");
infoService.showMessage("Sync rows filled successfully");
});
$anonymizeButton.click(async () => {
await server.post('anonymization/anonymize');
utils.showMessage("Created anonymized database");
infoService.showMessage("Created anonymized database");
});
$cleanupSoftDeletedButton.click(async () => {
if (confirm("Do you really want to clean up soft-deleted items?")) {
await server.post('cleanup/cleanup-soft-deleted-items');
utils.showMessage("Soft deleted items have been cleaned up");
infoService.showMessage("Soft deleted items have been cleaned up");
}
});
@@ -192,14 +193,14 @@ addModule((async function () {
if (confirm("Do you really want to clean up unused images?")) {
await server.post('cleanup/cleanup-unused-images');
utils.showMessage("Unused images have been cleaned up");
infoService.showMessage("Unused images have been cleaned up");
}
});
$vacuumDatabaseButton.click(async () => {
await server.post('cleanup/vacuum-database');
utils.showMessage("Database has been vacuumed");
infoService.showMessage("Database has been vacuumed");
});
return {};

View File

@@ -1,5 +1,6 @@
import utils from '../services/utils.js';
import server from '../services/server.js';
import infoService from "../services/info.js";
const $dialog = $("#sql-console-dialog");
const $query = $('#sql-console-query');
@@ -60,11 +61,11 @@ async function execute(e) {
});
if (!result.success) {
utils.showError(result.error);
infoService.showError(result.error);
return;
}
else {
utils.showMessage("Query was executed successfully.");
infoService.showMessage("Query was executed successfully.");
}
const rows = result.rows;