keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

imports

This commit is contained in:
antelle 2019-09-15 14:16:32 +02:00
parent 556c5dd56a
commit 9bbea458c6
168 changed files with 814 additions and 882 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
app/scripts/app.js
View File

@ -1,28 +1,30 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const AppModel = require('./models/app-model'); import { FileInfoCollection } from 'collections/file-info-collection';
const AppView = require('./views/app-view'); import { AppRightsChecker } from 'comp/app/app-rights-checker';
const AppSettingsModel = require('./models/app-settings-model'); import { ExportApi } from 'comp/app/export-api';
const UpdateModel = require('./models/update-model'); import { SingleInstanceChecker } from 'comp/app/single-instance-checker';
const RuntimeDataModel = require('./models/runtime-data-model'); import { Updater } from 'comp/app/updater';
const FileInfoCollection = require('./collections/file-info-collection'); import { AuthReceiver } from 'comp/browser/auth-receiver';
const KeyHandler = require('./comp/browser/key-handler'); import { FeatureTester } from 'comp/browser/feature-tester';
const IdleTracker = require('./comp/browser/idle-tracker'); import { FocusDetector } from 'comp/browser/focus-detector';
const PopupNotifier = require('./comp/browser/popup-notifier'); import { IdleTracker } from 'comp/browser/idle-tracker';
const SingleInstanceChecker = require('./comp/app/single-instance-checker'); import { KeyHandler } from 'comp/browser/key-handler';
const AppRightsChecker = require('./comp/app/app-rights-checker'); import { PopupNotifier } from 'comp/browser/popup-notifier';
const Alerts = require('./comp/ui/alerts'); import { Launcher } from 'comp/launcher';
const Updater = require('./comp/app/updater'); import { SettingsManager } from 'comp/settings/settings-manager';
const AuthReceiver = require('./comp/browser/auth-receiver'); import { Alerts } from 'comp/ui/alerts';
const ExportApi = require('./comp/app/export-api'); import { Timeouts } from 'const/timeouts';
const SettingsManager = require('./comp/settings/settings-manager'); import { AppModel } from 'models/app-model';
const PluginManager = require('./plugins/plugin-manager'); import { AppSettingsModel } from 'models/app-settings-model';
const Launcher = require('./comp/launcher'); import { RuntimeDataModel } from 'models/runtime-data-model';
const FeatureTester = require('./comp/browser/feature-tester'); import { UpdateModel } from 'models/update-model';
const FocusDetector = require('./comp/browser/focus-detector'); import { PluginManager } from 'plugins/plugin-manager';
const Timeouts = require('./const/timeouts'); import { Features } from 'util/features';
const Features = require('./util/features'); import { KdbxwebInit } from 'util/kdbxweb/kdbxweb-init';
const KdbxwebInit = require('./util/kdbxweb/kdbxweb-init'); import { Locale } from 'util/locale';
const Locale = require('./util/locale'); import { AppView } from 'views/app-view';
import 'view-engine/backbone-view-ext';
import 'hbs-helpers';
const ready = (Launcher && Launcher.ready) || $; const ready = (Launcher && Launcher.ready) || $;
@ -30,7 +32,6 @@ ready(() => {
if (AuthReceiver.receive() || Features.isFrame) { if (AuthReceiver.receive() || Features.isFrame) {
return; return;
} }
loadMixins();
const appModel = new AppModel(); const appModel = new AppModel();
@ -45,11 +46,6 @@ ready(() => {
appModel.appLogger.error('Error starting app', e); appModel.appLogger.error('Error starting app', e);
}); });
function loadMixins() {
require('./view-engine/backbone-view-ext');
require('./hbs-helpers');
}
function ensureCanRun() { function ensureCanRun() {
return FeatureTester.test().catch(e => { return FeatureTester.test().catch(e => {
Alerts.error({ Alerts.error({
@ -146,7 +142,10 @@ ready(() => {
Updater.init(); Updater.init();
SingleInstanceChecker.init(); SingleInstanceChecker.init();
AppRightsChecker.init(); AppRightsChecker.init();
setTimeout(() => PluginManager.instance.runAutoUpdate(), Timeouts.AutoUpdatePluginsAfterStart); setTimeout(
() => PluginManager.instance.runAutoUpdate(),
Timeouts.AutoUpdatePluginsAfterStart
);
} }
function showView() { function showView() {

7
app/scripts/auto-type/auto-type-emitter-factory.js
View File

@ -1,13 +1,14 @@
const Launcher = require('../comp/launcher'); import { Launcher } from 'comp/launcher';
const AutoTypeEmitterFactory = { const AutoTypeEmitterFactory = {
create(callback) { create(callback) {
if (Launcher && Launcher.autoTypeSupported) { if (Launcher && Launcher.autoTypeSupported) {
const AutoTypeEmitter = require('./emitter/auto-type-emitter-' + Launcher.platform()); const { AutoTypeEmitter } = require('./emitter/auto-type-emitter-' +
Launcher.platform());
return new AutoTypeEmitter(callback); return new AutoTypeEmitter(callback);
} }
return null; return null;
} }
}; };
module.exports = AutoTypeEmitterFactory; export { AutoTypeEmitterFactory };

6
app/scripts/auto-type/auto-type-filter.js
View File

@ -1,5 +1,5 @@
const EntryCollection = require('../collections/entry-collection'); import { EntryCollection } from 'collections/entry-collection';
const Ranking = require('../util/data/ranking'); import { Ranking } from 'util/data/ranking';
const urlPartsRegex = /^(\w+:\/\/)?(?:(?:www|wwws|secure)\.)?([^\/]+)\/?(.*)/; const urlPartsRegex = /^(\w+:\/\/)?(?:(?:www|wwws|secure)\.)?([^\/]+)\/?(.*)/;
@ -87,4 +87,4 @@ AutoTypeFilter.prototype.getEntryRank = function(entry) {
return rank; return rank;
}; };
module.exports = AutoTypeFilter; export { AutoTypeFilter };

6
app/scripts/auto-type/auto-type-helper-factory.js
View File

@ -1,13 +1,13 @@
const Launcher = require('../comp/launcher'); import { Launcher } from 'comp/launcher';
const AutoTypeHelperFactory = { const AutoTypeHelperFactory = {
create() { create() {
if (Launcher && Launcher.autoTypeSupported) { if (Launcher && Launcher.autoTypeSupported) {
const AutoTypeHelper = require('./helper/auto-type-helper-' + Launcher.platform()); const { AutoTypeHelper } = require('./helper/auto-type-helper-' + Launcher.platform());
return new AutoTypeHelper(); return new AutoTypeHelper();
} }
return null; return null;
} }
}; };
module.exports = AutoTypeHelperFactory; export { AutoTypeHelperFactory };

4
app/scripts/auto-type/auto-type-obfuscator.js
View File

@ -1,4 +1,4 @@
const Logger = require('../util/logger'); import { Logger } from 'util/logger';
const logger = new Logger('auto-type-obfuscator'); const logger = new Logger('auto-type-obfuscator');
logger.setLevel(localStorage.autoTypeDebug ? Logger.Level.All : Logger.Level.Warn); logger.setLevel(localStorage.autoTypeDebug ? Logger.Level.All : Logger.Level.Warn);
@ -203,4 +203,4 @@ AutoTypeObfuscator.prototype.deleteText = function(backward) {
} }
}; };
module.exports = AutoTypeObfuscator; export { AutoTypeObfuscator };

4
app/scripts/auto-type/auto-type-parser.js
View File

@ -1,4 +1,4 @@
const AutoTypeRunner = require('./auto-type-runner'); import { AutoTypeRunner } from 'auto-type/auto-type-runner';
const AutoTypeParser = function(sequence) { const AutoTypeParser = function(sequence) {
this.sequence = sequence; this.sequence = sequence;
@ -124,4 +124,4 @@ AutoTypeParser.prototype.addOp = function(op, sep, arg) {
}); });
}; };
module.exports = AutoTypeParser; export { AutoTypeParser };

10
app/scripts/auto-type/auto-type-runner.js
View File

@ -1,7 +1,7 @@
const AutoTypeObfuscator = require('./auto-type-obfuscator'); import { AutoTypeEmitterFactory } from 'auto-type/auto-type-emitter-factory';
const AutoTypeEmitterFactory = require('./auto-type-emitter-factory'); import { AutoTypeObfuscator } from 'auto-type/auto-type-obfuscator';
const StringFormat = require('../util/formatting/string-format'); import { StringFormat } from 'util/formatting/string-format';
const Logger = require('../util/logger'); import { Logger } from 'util/logger';
const emitterLogger = new Logger('auto-type-emitter'); const emitterLogger = new Logger('auto-type-emitter');
emitterLogger.setLevel(localStorage.autoTypeDebug ? Logger.Level.All : Logger.Level.Warn); emitterLogger.setLevel(localStorage.autoTypeDebug ? Logger.Level.All : Logger.Level.Warn);
@ -529,4 +529,4 @@ AutoTypeRunner.prototype.resetEmitterMod = function(targetState) {
}, this); }, this);
}; };
module.exports = AutoTypeRunner; export { AutoTypeRunner };

6
app/scripts/auto-type/emitter/auto-type-emitter-darwin.js
View File

@ -1,5 +1,5 @@
const Launcher = require('../../comp/launcher'); import { AutoTypeNativeHelper } from 'auto-type/helper/auto-type-native-helper';
const AutoTypeNativeHelper = require('../helper/auto-type-native-helper'); import { Launcher } from 'comp/launcher';
// http://eastmanreference.com/complete-list-of-applescript-key-codes/ // http://eastmanreference.com/complete-list-of-applescript-key-codes/
const KeyMap = { const KeyMap = {
@ -126,4 +126,4 @@ AutoTypeEmitter.prototype.runScript = function(script) {
}); });
}; };
module.exports = AutoTypeEmitter; export { AutoTypeEmitter };

6
app/scripts/auto-type/emitter/auto-type-emitter-linux.js
View File

@ -1,5 +1,5 @@
const Launcher = require('../../comp/launcher'); import { Launcher } from 'comp/launcher';
const Locale = require('../../util/locale'); import { Locale } from 'util/locale';
// https://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h // https://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
const KeyMap = { const KeyMap = {
@ -144,4 +144,4 @@ AutoTypeEmitter.prototype.runScript = function(script, callback) {
}); });
}; };
module.exports = AutoTypeEmitter; export { AutoTypeEmitter };

6
app/scripts/auto-type/emitter/auto-type-emitter-win32.js
View File

@ -1,5 +1,5 @@
const Launcher = require('../../comp/launcher'); import { AutoTypeNativeHelper } from 'auto-type/helper/auto-type-native-helper';
const AutoTypeNativeHelper = require('../helper/auto-type-native-helper'); import { Launcher } from 'comp/launcher';
// https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx // https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx
const KeyMap = { const KeyMap = {
@ -128,4 +128,4 @@ AutoTypeEmitter.prototype.runScript = function(script) {
}); });
}; };
module.exports = AutoTypeEmitter; export { AutoTypeEmitter };

4
app/scripts/auto-type/helper/auto-type-helper-darwin.js
View File

@ -1,4 +1,4 @@
const Launcher = require('../../comp/launcher'); import { Launcher } from 'comp/launcher';
const ForeMostAppScript = const ForeMostAppScript =
'tell application "System Events"\n' + 'tell application "System Events"\n' +
@ -89,4 +89,4 @@ AutoTypeHelper.exec = function(script, callback) {
}); });
}; };
module.exports = AutoTypeHelper; export { AutoTypeHelper };

4
app/scripts/auto-type/helper/auto-type-helper-linux.js
View File

@ -1,4 +1,4 @@
const Launcher = require('../../comp/launcher'); import { Launcher } from 'comp/launcher';
const AutoTypeHelper = function() {}; const AutoTypeHelper = function() {};
@ -20,4 +20,4 @@ AutoTypeHelper.prototype.getActiveWindowInfo = function(callback) {
}); });
}; };
module.exports = AutoTypeHelper; export { AutoTypeHelper };

6
app/scripts/auto-type/helper/auto-type-helper-win32.js
View File

@ -1,5 +1,5 @@
const Launcher = require('../../comp/launcher'); import { AutoTypeNativeHelper } from 'auto-type/helper/auto-type-native-helper';
const AutoTypeNativeHelper = require('./auto-type-native-helper'); import { Launcher } from 'comp/launcher';
const AutoTypeHelper = function() {}; const AutoTypeHelper = function() {};
@ -22,4 +22,4 @@ AutoTypeHelper.prototype.getActiveWindowInfo = function(callback) {
}); });
}; };
module.exports = AutoTypeHelper; export { AutoTypeHelper };

6
app/scripts/auto-type/helper/auto-type-native-helper.js
View File

@ -1,5 +1,5 @@
const Launcher = require('../../comp/launcher'); import { Launcher } from 'comp/launcher';
const Logger = require('../../util/logger'); import { Logger } from 'util/logger';
const logger = new Logger('auto-type'); const logger = new Logger('auto-type');
@ -18,4 +18,4 @@ const AutoTypeNativeHelper = {
} }
}; };
module.exports = AutoTypeNativeHelper; export { AutoTypeNativeHelper };

24
app/scripts/auto-type/index.js
View File

@ -1,14 +1,14 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const AutoTypeParser = require('./auto-type-parser'); import { AutoTypeFilter } from 'auto-type/auto-type-filter';
const AutoTypeFilter = require('./auto-type-filter'); import { AutoTypeHelperFactory } from 'auto-type/auto-type-helper-factory';
const AutoTypeHelperFactory = require('./auto-type-helper-factory'); import { AutoTypeParser } from 'auto-type/auto-type-parser';
const Launcher = require('../comp/launcher'); import { Launcher } from 'comp/launcher';
const Alerts = require('../comp/ui/alerts'); import { Alerts } from 'comp/ui/alerts';
const AutoTypeSelectView = require('../views/auto-type/auto-type-select-view'); import { Timeouts } from 'const/timeouts';
const Logger = require('../util/logger'); import { AppSettingsModel } from 'models/app-settings-model';
const Locale = require('../util/locale'); import { Locale } from 'util/locale';
const Timeouts = require('../const/timeouts'); import { Logger } from 'util/logger';
const AppSettingsModel = require('../models/app-settings-model'); import { AutoTypeSelectView } from 'views/auto-type/auto-type-select-view';
const logger = new Logger('auto-type'); const logger = new Logger('auto-type');
const clearTextAutoTypeLog = localStorage.autoTypeDebug; const clearTextAutoTypeLog = localStorage.autoTypeDebug;
@ -282,4 +282,4 @@ const AutoType = {
} }
}; };
module.exports = AutoType; export { AutoType };

8
app/scripts/collections/entry-collection.js
View File

@ -1,6 +1,6 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const EntryModel = require('../models/entry-model'); import { EntryModel } from 'models/entry-model';
const Comparators = require('../util/data/comparators'); import { Comparators } from 'util/data/comparators';
const EntryCollection = Backbone.Collection.extend({ const EntryCollection = Backbone.Collection.extend({
model: EntryModel, model: EntryModel,
@ -50,4 +50,4 @@ const EntryCollection = Backbone.Collection.extend({
} }
}); });
module.exports = EntryCollection; export { EntryCollection };

6
app/scripts/collections/file-collection.js
View File

@ -1,5 +1,5 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const FileModel = require('../models/file-model'); import { FileModel } from 'models/file-model';
const FileCollection = Backbone.Collection.extend({ const FileCollection = Backbone.Collection.extend({
model: FileModel, model: FileModel,
@ -21,4 +21,4 @@ const FileCollection = Backbone.Collection.extend({
} }
}); });
module.exports = FileCollection; export { FileCollection };

8
app/scripts/collections/file-info-collection.js
View File

@ -1,6 +1,6 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const FileInfoModel = require('../models/file-info-model'); import { SettingsStore } from 'comp/settings/settings-store';
const SettingsStore = require('../comp/settings/settings-store'); import { FileInfoModel } from 'models/file-info-model';
const FileInfoCollection = Backbone.Collection.extend({ const FileInfoCollection = Backbone.Collection.extend({
model: FileInfoModel, model: FileInfoModel,
@ -40,4 +40,4 @@ const FileInfoCollection = Backbone.Collection.extend({
FileInfoCollection.instance = new FileInfoCollection(); FileInfoCollection.instance = new FileInfoCollection();
module.exports = FileInfoCollection; export { FileInfoCollection };

6
app/scripts/collections/group-collection.js
View File

@ -1,8 +1,8 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const GroupModel = require('../models/group-model'); import { GroupModel } from 'models/group-model';
const GroupCollection = Backbone.Collection.extend({ const GroupCollection = Backbone.Collection.extend({
model: GroupModel model: GroupModel
}); });
module.exports = GroupCollection; export { GroupCollection };

6
app/scripts/collections/menu/menu-item-collection.js
View File

@ -1,8 +1,8 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const MenuItemModel = require('../../models/menu/menu-item-model'); import { MenuItemModel } from 'models/menu/menu-item-model';
const MenuItemCollection = Backbone.Collection.extend({ const MenuItemCollection = Backbone.Collection.extend({
model: MenuItemModel model: MenuItemModel
}); });
module.exports = MenuItemCollection; export { MenuItemCollection };

6
app/scripts/collections/menu/menu-option-collection.js
View File

@ -1,8 +1,8 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const MenuOptionModel = require('../../models/menu/menu-option-model'); import { MenuOptionModel } from 'models/menu/menu-option-model';
const MenuOptionCollection = Backbone.Collection.extend({ const MenuOptionCollection = Backbone.Collection.extend({
model: MenuOptionModel model: MenuOptionModel
}); });
module.exports = MenuOptionCollection; export { MenuOptionCollection };

6
app/scripts/collections/menu/menu-section-collection.js
View File

@ -1,8 +1,8 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const MenuSectionModel = require('../../models/menu/menu-section-model'); import { MenuSectionModel } from 'models/menu/menu-section-model';
const MenuSectionCollection = Backbone.Collection.extend({ const MenuSectionCollection = Backbone.Collection.extend({
model: MenuSectionModel model: MenuSectionModel
}); });
module.exports = MenuSectionCollection; export { MenuSectionCollection };

12
app/scripts/comp/app/app-rights-checker.js
View File

@ -1,8 +1,8 @@
const Features = require('../../util/features'); import { Launcher } from 'comp/launcher';
const Alerts = require('../ui/alerts'); import { Alerts } from 'comp/ui/alerts';
const AppSettingsModel = require('../../models/app-settings-model'); import { AppSettingsModel } from 'models/app-settings-model';
const Launcher = require('../launcher'); import { Features } from 'util/features';
const Locale = require('../../util/locale'); import { Locale } from 'util/locale';
const AppRightsChecker = { const AppRightsChecker = {
AppPath: '/Applications/KeeWeb.app', AppPath: '/Applications/KeeWeb.app',
@ -77,4 +77,4 @@ const AppRightsChecker = {
} }
}; };
module.exports = AppRightsChecker; export { AppRightsChecker };

2
app/scripts/comp/app/drag-drop-info.js
View File

@ -2,4 +2,4 @@ const DragDropInfo = {
dragObject: null dragObject: null
}; };
module.exports = DragDropInfo; export { DragDropInfo };

4
app/scripts/comp/app/dropbox-chooser.js
View File

@ -1,4 +1,4 @@
const AppSettingsModel = require('../../models/app-settings-model'); import { AppSettingsModel } from 'models/app-settings-model';
const ChooserAppKey = 'qp7ctun6qt5n9d6'; const ChooserAppKey = 'qp7ctun6qt5n9d6';
@ -104,4 +104,4 @@ DropboxChooser.prototype.readFile = function(url) {
xhr.send(); xhr.send();
}; };
module.exports = DropboxChooser; export { DropboxChooser };

4
app/scripts/comp/app/export-api.js
View File

@ -1,4 +1,4 @@
const AppSettingsModel = require('../../models/app-settings-model'); import { AppSettingsModel } from 'models/app-settings-model';
const ExportApi = { const ExportApi = {
settings: { settings: {
@ -14,4 +14,4 @@ const ExportApi = {
} }
}; };
module.exports = ExportApi; export { ExportApi };

6
app/scripts/comp/app/generator-presets.js
View File

@ -1,5 +1,5 @@
const AppSettingsModel = require('../../models/app-settings-model'); import { AppSettingsModel } from 'models/app-settings-model';
const Locale = require('../../util/locale'); import { Locale } from 'util/locale';
const GeneratorPresets = { const GeneratorPresets = {
get defaultPreset() { get defaultPreset() {
@ -165,4 +165,4 @@ const GeneratorPresets = {
} }
}; };
module.exports = GeneratorPresets; export { GeneratorPresets };

4
app/scripts/comp/app/runtime-info.js
View File

@ -1,4 +1,4 @@
const Launcher = require('../launcher'); import { Launcher } from 'comp/launcher';
const RuntimeInfo = { const RuntimeInfo = {
version: '@@VERSION', version: '@@VERSION',
@ -9,4 +9,4 @@ const RuntimeInfo = {
launcher: Launcher ? Launcher.name + ' v' + Launcher.version : '' launcher: Launcher ? Launcher.name + ' v' + Launcher.version : ''
}; };
module.exports = RuntimeInfo; export { RuntimeInfo };

12
app/scripts/comp/app/shortcuts.js
View File

@ -1,8 +1,8 @@
const Features = require('../../util/features'); import { Launcher } from 'comp/launcher';
const Keys = require('../../const/keys'); import { Keys } from 'const/keys';
const StringFormat = require('../../util/formatting/string-format'); import { AppSettingsModel } from 'models/app-settings-model';
const AppSettingsModel = require('../../models/app-settings-model'); import { Features } from 'util/features';
const Launcher = require('../launcher'); import { StringFormat } from 'util/formatting/string-format';
let allowedKeys; let allowedKeys;
@ -128,4 +128,4 @@ const Shortcuts = {
} }
}; };
module.exports = Shortcuts; export { Shortcuts };

6
app/scripts/comp/app/single-instance-checker.js
View File

@ -1,5 +1,5 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const Launcher = require('../launcher'); import { Launcher } from 'comp/launcher';
const LocalStorageKeyName = 'instanceCheck'; const LocalStorageKeyName = 'instanceCheck';
const LocalStorageResponseKeyName = 'instanceMaster'; const LocalStorageResponseKeyName = 'instanceMaster';
@ -40,4 +40,4 @@ const SingleInstanceChecker = {
} }
}; };
module.exports = SingleInstanceChecker; export { SingleInstanceChecker };

22
app/scripts/comp/app/updater.js
View File

@ -1,13 +1,13 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const RuntimeInfo = require('../app/runtime-info'); import { RuntimeInfo } from 'comp/app/runtime-info';
const Links = require('../../const/links'); import { Transport } from 'comp/browser/transport';
const Launcher = require('../launcher'); import { Launcher } from 'comp/launcher';
const AppSettingsModel = require('../../models/app-settings-model'); import { Links } from 'const/links';
const UpdateModel = require('../../models/update-model'); import { AppSettingsModel } from 'models/app-settings-model';
const Transport = require('../browser/transport'); import { UpdateModel } from 'models/update-model';
const Logger = require('../../util/logger'); import { SemVer } from 'util/data/semver';
const SemVer = require('../../util/data/semver'); import { Logger } from 'util/logger';
const publicKey = require('public-key.pem').default; import publicKey from 'public-key.pem';
const logger = new Logger('updater'); const logger = new Logger('updater');
@ -273,4 +273,4 @@ const Updater = {
} }
}; };
module.exports = Updater; export { Updater };

6
app/scripts/comp/browser/auth-receiver.js
View File

@ -1,5 +1,5 @@
const Features = require('../../util/features'); import { Storage } from 'storage';
const Storage = require('../../storage'); import { Features } from 'util/features';
const AuthReceiver = { const AuthReceiver = {
receive() { receive() {
@ -36,4 +36,4 @@ const AuthReceiver = {
} }
}; };
module.exports = AuthReceiver; export { AuthReceiver };

8
app/scripts/comp/browser/copy-paste.js
View File

@ -1,6 +1,6 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const Launcher = require('../launcher'); import { Launcher } from 'comp/launcher';
const AppSettingsModel = require('../../models/app-settings-model'); import { AppSettingsModel } from 'models/app-settings-model';
const CopyPaste = { const CopyPaste = {
simpleCopy: !!(Launcher && Launcher.clipboardSupported), simpleCopy: !!(Launcher && Launcher.clipboardSupported),
@ -68,4 +68,4 @@ const CopyPaste = {
} }
}; };
module.exports = CopyPaste; export { CopyPaste };

6
app/scripts/comp/browser/feature-tester.js
View File

@ -1,5 +1,5 @@
const kdbxweb = require('kdbxweb'); import kdbxweb from 'kdbxweb';
const Features = require('../../util/features'); import { Features } from 'util/features';
const FeatureTester = { const FeatureTester = {
test() { test() {
@ -63,4 +63,4 @@ const FeatureTester = {
} }
}; };
module.exports = FeatureTester; export { FeatureTester };

8
app/scripts/comp/browser/focus-detector.js
View File

@ -1,6 +1,6 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const Features = require('../../util/features'); import { Launcher } from 'comp/launcher';
const Launcher = require('../launcher'); import { Features } from 'util/features';
const FocusDetector = { const FocusDetector = {
init() { init() {
@ -33,4 +33,4 @@ const FocusDetector = {
} }
}; };
module.exports = FocusDetector; export { FocusDetector };

6
app/scripts/comp/browser/idle-tracker.js
View File

@ -1,5 +1,5 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const AppSettingsModel = require('../../models/app-settings-model'); import { AppSettingsModel } from 'models/app-settings-model';
const IdleTracker = { const IdleTracker = {
actionTime: Date.now(), actionTime: Date.now(),
@ -20,4 +20,4 @@ const IdleTracker = {
Backbone.on('power-monitor-resume', IdleTracker.checkIdle, IdleTracker); Backbone.on('power-monitor-resume', IdleTracker.checkIdle, IdleTracker);
module.exports = IdleTracker; export { IdleTracker };

8
app/scripts/comp/browser/key-handler.js
View File

@ -1,6 +1,6 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const Keys = require('../../const/keys'); import { IdleTracker } from 'comp/browser/idle-tracker';
const IdleTracker = require('./idle-tracker'); import { Keys } from 'const/keys';
const shortcutKeyProp = navigator.platform.indexOf('Mac') >= 0 ? 'metaKey' : 'ctrlKey'; const shortcutKeyProp = navigator.platform.indexOf('Mac') >= 0 ? 'metaKey' : 'ctrlKey';
@ -132,4 +132,4 @@ const KeyHandler = {
_.extend(KeyHandler, Backbone.Events); _.extend(KeyHandler, Backbone.Events);
module.exports = KeyHandler; export { KeyHandler };

18
app/scripts/comp/browser/popup-notifier.js
View File

@ -1,11 +1,11 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const Alerts = require('../ui/alerts'); import { AuthReceiver } from 'comp/browser/auth-receiver';
const Launcher = require('../launcher'); import { Launcher } from 'comp/launcher';
const AuthReceiver = require('./auth-receiver'); import { Alerts } from 'comp/ui/alerts';
const Links = require('../../const/links'); import { Links } from 'const/links';
const Timeouts = require('../../const/timeouts'); import { Timeouts } from 'const/timeouts';
const Locale = require('../../util/locale'); import { Locale } from 'util/locale';
const Logger = require('../../util/logger'); import { Logger } from 'util/logger';
const PopupNotifier = { const PopupNotifier = {
logger: null, logger: null,
@ -157,4 +157,4 @@ const PopupNotifier = {
} }
}; };
module.exports = PopupNotifier; export { PopupNotifier };

4
app/scripts/comp/browser/secure-input.js
View File

@ -1,4 +1,4 @@
const kdbxweb = require('kdbxweb'); import kdbxweb from 'kdbxweb';
const SecureInput = function() { const SecureInput = function() {
this.el = null; this.el = null;
@ -97,4 +97,4 @@ Object.defineProperty(SecureInput.prototype, 'value', {
} }
}); });
module.exports = SecureInput; export { SecureInput };

6
app/scripts/comp/browser/transport.js
View File

@ -1,5 +1,5 @@
const Launcher = require('../launcher'); import { Launcher } from 'comp/launcher';
const Logger = require('../../util/logger'); import { Logger } from 'util/logger';
const logger = new Logger('transport'); const logger = new Logger('transport');
@ -89,4 +89,4 @@ const Transport = {
} }
}; };
module.exports = Transport; export { Transport };

16
app/scripts/comp/format/kdbx-to-html.js
View File

@ -1,10 +1,10 @@
const kdbxweb = require('kdbxweb'); import kdbxweb from 'kdbxweb';
const StringFormat = require('../../util/formatting/string-format'); import { RuntimeInfo } from 'comp/app/runtime-info';
const DateFormat = require('../../util/formatting/date-format'); import { Links } from 'const/links';
const Locale = require('../../util/locale'); import { DateFormat } from 'util/formatting/date-format';
const MdToHtml = require('../../util/formatting/md-to-html'); import { MdToHtml } from 'util/formatting/md-to-html';
const Links = require('../../const/links'); import { StringFormat } from 'util/formatting/string-format';
const RuntimeInfo = require('../app/runtime-info'); import { Locale } from 'util/locale';
const Templates = { const Templates = {
db: require('templates/export/db.hbs'), db: require('templates/export/db.hbs'),
@ -123,4 +123,4 @@ const KdbxToHtml = {
} }
}; };
module.exports = KdbxToHtml; export { KdbxToHtml };

22
app/scripts/comp/format/otp-qr-reader.js
View File

@ -1,11 +1,11 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const Alerts = require('../ui/alerts'); import QrCode from 'jsqrcode';
const Locale = require('../../util/locale'); import { Shortcuts } from 'comp/app/shortcuts';
const Logger = require('../../util/logger'); import { Alerts } from 'comp/ui/alerts';
const Features = require('../../util/features'); import { Otp } from 'util/data/otp';
const Shortcuts = require('../../comp/app/shortcuts'); import { Features } from 'util/features';
const Otp = require('../../util/data/otp'); import { Locale } from 'util/locale';
const QrCode = require('jsqrcode'); import { Logger } from 'util/logger';
const logger = new Logger('otp-qr-reader'); const logger = new Logger('otp-qr-reader');
@ -63,10 +63,6 @@ const OtpQrReader = {
} }
} }
}); });
// transparent window with QR scanner - is it better? check usability of this
// var BrowserWindow = require('../../comp/launcher').remReq('browser-window');
// new BrowserWindow({ width: 800, height: 600, show: false, alwaysOnTop: true, backgroundColor: '#80FFFFFF',
// transparent: true }).show();
}, },
selectFile() { selectFile() {
@ -181,4 +177,4 @@ const OtpQrReader = {
_.extend(OtpQrReader, Backbone.Events); _.extend(OtpQrReader, Backbone.Events);
module.exports = OtpQrReader; export { OtpQrReader };

6
app/scripts/comp/launcher/index.js
View File

@ -1,9 +1,9 @@
let Launcher; let Launcher;
if (window.process && window.process.versions && window.process.versions.electron) { if (window.process && window.process.versions && window.process.versions.electron) {
Launcher = require('./launcher-electron'); Launcher = require('./launcher-electron').Launcher;
} else if (window.cordova) { } else if (window.cordova) {
// Launcher = require('./launcher-cordova'); // commented out, while we don't support cordova // Launcher = require('./launcher-cordova').Launcher; // commented out, while we don't support cordova
} }
module.exports = Launcher; export { Launcher };

4
app/scripts/comp/launcher/launcher-cordova.js
View File

@ -1,6 +1,6 @@
/* global FingerprintAuth */ /* global FingerprintAuth */
const Backbone = require('backbone'); import Backbone from 'backbone';
const Launcher = { const Launcher = {
name: 'cordova', name: 'cordova',
@ -295,4 +295,4 @@ const Launcher = {
} }
}; };
module.exports = Launcher; export { Launcher };

8
app/scripts/comp/launcher/launcher-electron.js
View File

@ -1,6 +1,6 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const Locale = require('../../util/locale'); import { Locale } from 'util/locale';
const Logger = require('../../util/logger'); import { Logger } from 'util/logger';
const logger = new Logger('launcher'); const logger = new Logger('launcher');
@ -309,4 +309,4 @@ if (window.launcherOpenedFile) {
} }
Backbone.on('app-ready', () => setTimeout(() => Launcher.checkOpenFiles(), 0)); Backbone.on('app-ready', () => setTimeout(() => Launcher.checkOpenFiles(), 0));
module.exports = Launcher; export { Launcher };

8
app/scripts/comp/settings/settings-manager.js
View File

@ -1,6 +1,6 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const Locale = require('../../util/locale'); import { Features } from 'util/features';
const Features = require('../../util/features'); import { Locale } from 'util/locale';
const appleThemes = { const appleThemes = {
macdark: 'setGenThemeMacDark' macdark: 'setGenThemeMacDark'
@ -97,4 +97,4 @@ const SettingsManager = {
} }
}; };
module.exports = SettingsManager; export { SettingsManager };

8
app/scripts/comp/settings/settings-store.js
View File

@ -1,6 +1,6 @@
const Launcher = require('../launcher'); import { Launcher } from 'comp/launcher';
const StringFormat = require('../../util/formatting/string-format'); import { StringFormat } from 'util/formatting/string-format';
const Logger = require('../../util/logger'); import { Logger } from 'util/logger';
const logger = new Logger('settings'); const logger = new Logger('settings');
@ -61,4 +61,4 @@ const SettingsStore = {
} }
}; };
module.exports = SettingsStore; export { SettingsStore };

6
app/scripts/comp/ui/alerts.js
View File

@ -1,5 +1,5 @@
const ModalView = require('../../views/modal-view'); import { Locale } from 'util/locale';
const Locale = require('../../util/locale'); import { ModalView } from 'views/modal-view';
const Alerts = { const Alerts = {
alertDisplayed: false, alertDisplayed: false,
@ -117,4 +117,4 @@ const Alerts = {
} }
}; };
module.exports = Alerts; export { Alerts };

2
app/scripts/const/colors.js
View File

@ -20,4 +20,4 @@ const Colors = {
} }
}; };
module.exports = Colors; export { Colors };

2
app/scripts/const/icon-map.js
View File

@ -70,4 +70,4 @@ const IconMap = [
'mobile' 'mobile'
]; ];
module.exports = IconMap; export { IconMap };

2
app/scripts/const/keys.js
View File

@ -116,4 +116,4 @@ const Keys = {
DOM_VK_META: 224 DOM_VK_META: 224
}; };
module.exports = Keys; export { Keys };

2
app/scripts/const/links.js
View File

@ -17,4 +17,4 @@ const Links = {
PluginDevelopStart: 'https://github.com/keeweb/keeweb/wiki/Plugins' PluginDevelopStart: 'https://github.com/keeweb/keeweb/wiki/Plugins'
}; };
module.exports = Links; export { Links };

2
app/scripts/const/timeouts.js
View File

@ -14,4 +14,4 @@ const Timeouts = {
LinkDownloadRevoke: 10 * 1000 * 60 LinkDownloadRevoke: 10 * 1000 * 60
}; };
module.exports = Timeouts; export { Timeouts };

2
app/scripts/hbs-helpers/add.js
View File

@ -1,4 +1,4 @@
const Handlebars = require('hbs'); import Handlebars from 'hbs';
// inspired by https://stackoverflow.com/questions/22103989/adding-offset-to-index-when-looping-through-items-in-handlebars/39588001#39588001 // inspired by https://stackoverflow.com/questions/22103989/adding-offset-to-index-when-looping-through-items-in-handlebars/39588001#39588001
Handlebars.registerHelper('add', (lvalue, rvalue) => parseInt(lvalue) + parseInt(rvalue)); Handlebars.registerHelper('add', (lvalue, rvalue) => parseInt(lvalue) + parseInt(rvalue));

2
app/scripts/hbs-helpers/cmp.js
View File

@ -1,4 +1,4 @@
const Handlebars = require('hbs'); import Handlebars from 'hbs';
Handlebars.registerHelper('cmp', function(lvalue, rvalue, op, options) { Handlebars.registerHelper('cmp', function(lvalue, rvalue, op, options) {
let cond; let cond;

2
app/scripts/hbs-helpers/ifemptyoreq.js
View File

@ -1,4 +1,4 @@
const Handlebars = require('hbs'); import Handlebars from 'hbs';
Handlebars.registerHelper('ifemptyoreq', function(lvalue, rvalue, options) { Handlebars.registerHelper('ifemptyoreq', function(lvalue, rvalue, options) {
return !lvalue || lvalue === rvalue ? options.fn(this) : options.inverse(this); return !lvalue || lvalue === rvalue ? options.fn(this) : options.inverse(this);

2
app/scripts/hbs-helpers/ifeq.js
View File

@ -1,4 +1,4 @@
const Handlebars = require('hbs'); import Handlebars from 'hbs';
Handlebars.registerHelper('ifeq', function(lvalue, rvalue, options) { Handlebars.registerHelper('ifeq', function(lvalue, rvalue, options) {
return lvalue === rvalue ? options.fn(this) : options.inverse(this); return lvalue === rvalue ? options.fn(this) : options.inverse(this);

2
app/scripts/hbs-helpers/ifneq.js
View File

@ -1,4 +1,4 @@
const Handlebars = require('hbs'); import Handlebars from 'hbs';
Handlebars.registerHelper('ifneq', function(lvalue, rvalue, options) { Handlebars.registerHelper('ifneq', function(lvalue, rvalue, options) {
return lvalue !== rvalue ? options.fn(this) : options.inverse(this); return lvalue !== rvalue ? options.fn(this) : options.inverse(this);

12
app/scripts/hbs-helpers/index.js
View File

@ -1,6 +1,6 @@
require('./add'); import 'hbs-helpers/add';
require('./cmp'); import 'hbs-helpers/cmp';
require('./ifeq'); import 'hbs-helpers/ifeq';
require('./ifneq'); import 'hbs-helpers/ifneq';
require('./ifemptyoreq'); import 'hbs-helpers/ifemptyoreq';
require('./res'); import 'hbs-helpers/res';

4
app/scripts/hbs-helpers/res.js
View File

@ -1,5 +1,5 @@
const Handlebars = require('hbs'); import Handlebars from 'hbs';
const Locale = require('../util/locale'); import { Locale } from 'util/locale';
Handlebars.registerHelper('res', function(key, options) { Handlebars.registerHelper('res', function(key, options) {
let value = Locale[key]; let value = Locale[key];

49
app/scripts/models/app-model.js
View File

@ -1,27 +1,26 @@
const Backbone = require('backbone'); import { AutoType } from 'auto-type';
const AppSettingsModel = require('./app-settings-model'); import Backbone from 'backbone';
const MenuModel = require('./menu/menu-model'); import { Storage } from 'storage';
const EntryModel = require('./entry-model'); import { EntryCollection } from 'collections/entry-collection';
const GroupModel = require('./group-model'); import { FileCollection } from 'collections/file-collection';
const FileCollection = require('../collections/file-collection'); import { FileInfoCollection } from 'collections/file-info-collection';
const EntryCollection = require('../collections/entry-collection'); import { RuntimeInfo } from 'comp/app/runtime-info';
const FileInfoCollection = require('../collections/file-info-collection'); import { Launcher } from 'comp/launcher';
const FileModel = require('./file-model'); import { Timeouts } from 'const/timeouts';
const FileInfoModel = require('./file-info-model'); import { AppSettingsModel } from 'models/app-settings-model';
const Storage = require('../storage'); import { EntryModel } from 'models/entry-model';
const Timeouts = require('../const/timeouts'); import { FileInfoModel } from 'models/file-info-model';
const IdGenerator = require('../util/generators/id-generator'); import { FileModel } from 'models/file-model';
const Logger = require('../util/logger'); import { GroupModel } from 'models/group-model';
const Features = require('../util/features'); import { MenuModel } from 'models/menu/menu-model';
const DateFormat = require('../util/formatting/date-format'); import { PluginManager } from 'plugins/plugin-manager';
const UrlFormat = require('../util/formatting/url-format'); import { Features } from 'util/features';
const AutoType = require('../auto-type'); import { DateFormat } from 'util/formatting/date-format';
const Launcher = require('../comp/launcher'); import { UrlFormat } from 'util/formatting/url-format';
const RuntimeInfo = require('../comp/app/runtime-info'); import { IdGenerator } from 'util/generators/id-generator';
const PluginManager = require('../plugins/plugin-manager'); import { Locale } from 'util/locale';
const Locale = require('../util/locale'); import { Logger } from 'util/logger';
import 'util/kdbxweb/protected-value-ex';
require('../util/kdbxweb/protected-value-ex');
const AppModel = Backbone.Model.extend({ const AppModel = Backbone.Model.extend({
defaults: {}, defaults: {},
@ -1163,4 +1162,4 @@ const AppModel = Backbone.Model.extend({
} }
}); });
module.exports = AppModel; export { AppModel };

6
app/scripts/models/app-settings-model.js
View File

@ -1,5 +1,5 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const SettingsStore = require('../comp/settings/settings-store'); import { SettingsStore } from 'comp/settings/settings-store';
const AppSettingsModel = Backbone.Model.extend({ const AppSettingsModel = Backbone.Model.extend({
defaults: { defaults: {
@ -80,4 +80,4 @@ const AppSettingsModel = Backbone.Model.extend({
AppSettingsModel.instance = new AppSettingsModel(); AppSettingsModel.instance = new AppSettingsModel();
module.exports = AppSettingsModel; export { AppSettingsModel };

4
app/scripts/models/attachment-model.js
View File

@ -1,4 +1,4 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const AttachmentModel = Backbone.Model.extend({ const AttachmentModel = Backbone.Model.extend({
defaults: {}, defaults: {},
@ -168,4 +168,4 @@ AttachmentModel.fromAttachment = function(att) {
return model; return model;
}; };
module.exports = AttachmentModel; export { AttachmentModel };

20
app/scripts/models/entry-model.js
View File

@ -1,12 +1,12 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const AttachmentModel = require('./attachment-model'); import kdbxweb from 'kdbxweb';
const IconMap = require('../const/icon-map'); import { KdbxToHtml } from 'comp/format/kdbx-to-html';
const Color = require('../util/data/color'); import { IconMap } from 'const/icon-map';
const IconUrlFormat = require('../util/formatting/icon-url-format'); import { AttachmentModel } from 'models/attachment-model';
const Otp = require('../util/data/otp'); import { Color } from 'util/data/color';
const kdbxweb = require('kdbxweb'); import { Otp } from 'util/data/otp';
const Ranking = require('../util/data/ranking'); import { Ranking } from 'util/data/ranking';
const KdbxToHtml = require('../comp/format/kdbx-to-html'); import { IconUrlFormat } from 'util/formatting/icon-url-format';
const EntryModel = Backbone.Model.extend({ const EntryModel = Backbone.Model.extend({
defaults: {}, defaults: {},
@ -731,4 +731,4 @@ EntryModel.newEntry = function(group, file) {
return model; return model;
}; };
module.exports = EntryModel; export { EntryModel };

4
app/scripts/models/file-info-model.js
View File

@ -1,4 +1,4 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const FileInfoModel = Backbone.Model.extend({ const FileInfoModel = Backbone.Model.extend({
defaults: { defaults: {
@ -31,4 +31,4 @@ const FileInfoModel = Backbone.Model.extend({
} }
}); });
module.exports = FileInfoModel; export { FileInfoModel };

18
app/scripts/models/file-model.js
View File

@ -1,11 +1,11 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const GroupCollection = require('../collections/group-collection'); import kdbxweb from 'kdbxweb';
const GroupModel = require('./group-model'); import demoFileData from 'demo.kdbx';
const IconUrlFormat = require('../util/formatting/icon-url-format'); import { GroupCollection } from 'collections/group-collection';
const Logger = require('../util/logger'); import { KdbxToHtml } from 'comp/format/kdbx-to-html';
const KdbxToHtml = require('../comp/format/kdbx-to-html'); import { GroupModel } from 'models/group-model';
const kdbxweb = require('kdbxweb'); import { IconUrlFormat } from 'util/formatting/icon-url-format';
const demoFileData = require('demo.kdbx'); import { Logger } from 'util/logger';
const logger = new Logger('file'); const logger = new Logger('file');
@ -713,4 +713,4 @@ FileModel.createKeyFileWithHash = function(hash) {
return kdbxweb.Credentials.createKeyFileWithHash(hash); return kdbxweb.Credentials.createKeyFileWithHash(hash);
}; };
module.exports = FileModel; export { FileModel };

26
app/scripts/models/group-model.js
View File

@ -1,11 +1,12 @@
const MenuItemModel = require('./menu/menu-item-model'); import kdbxweb from 'kdbxweb';
const EntryModel = require('../models/entry-model'); import { IconMap } from 'const/icon-map';
const IconMap = require('../const/icon-map'); import { EntryModel } from 'models/entry-model';
const IconUrlFormat = require('../util/formatting/icon-url-format'); import { MenuItemModel } from 'models/menu/menu-item-model';
const kdbxweb = require('kdbxweb'); import { IconUrlFormat } from 'util/formatting/icon-url-format';
import { GroupCollection } from 'collections/group-collection';
import { EntryCollection } from 'collections/entry-collection';
const KdbxIcons = kdbxweb.Consts.Icons; const KdbxIcons = kdbxweb.Consts.Icons;
let GroupCollection;
let EntryCollection;
const DefaultAutoTypeSequence = '{USERNAME}{TAB}{PASSWORD}{ENTER}'; const DefaultAutoTypeSequence = '{USERNAME}{TAB}{PASSWORD}{ENTER}';
@ -23,15 +24,6 @@ const GroupModel = MenuItemModel.extend({
autoTypeSeq: null autoTypeSeq: null
}), }),
initialize() {
if (!GroupCollection) {
GroupCollection = require('../collections/group-collection');
}
if (!EntryCollection) {
EntryCollection = require('../collections/entry-collection');
}
},
setGroup(group, file, parentGroup) { setGroup(group, file, parentGroup) {
const isRecycleBin = group.uuid.equals(file.db.meta.recycleBinUuid); const isRecycleBin = group.uuid.equals(file.db.meta.recycleBinUuid);
const id = file.subId(group.uuid.id); const id = file.subId(group.uuid.id);
@ -362,4 +354,4 @@ GroupModel.newGroup = function(group, file) {
return model; return model;
}; };
module.exports = GroupModel; export { GroupModel };

8
app/scripts/models/menu/groups-menu-model.js
View File

@ -1,5 +1,5 @@
const MenuSectionModel = require('./menu-section-model'); import { GroupCollection } from 'collections/group-collection';
const GroupCollection = require('../../collections/group-collection'); import { MenuSectionModel } from 'models/menu/menu-section-model';
const GroupsMenuModel = MenuSectionModel.extend({ const GroupsMenuModel = MenuSectionModel.extend({
defaults: _.extend({}, MenuSectionModel.prototype.defaults, { defaults: _.extend({}, MenuSectionModel.prototype.defaults, {
@ -12,8 +12,8 @@ const GroupsMenuModel = MenuSectionModel.extend({
}, },
_loadItemCollectionType() { _loadItemCollectionType() {
return require('../../collections/group-collection'); return require('collections/group-collection').GroupCollection;
} }
}); });
module.exports = GroupsMenuModel; export { GroupsMenuModel };

8
app/scripts/models/menu/menu-item-model.js
View File

@ -1,5 +1,5 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const MenuOptionCollection = require('../../collections/menu/menu-option-collection'); import { MenuOptionCollection } from 'collections/menu/menu-option-collection';
let ItemCollection; let ItemCollection;
const MenuItemModel = Backbone.Model.extend({ const MenuItemModel = Backbone.Model.extend({
@ -29,7 +29,7 @@ const MenuItemModel = Backbone.Model.extend({
}, },
_loadItemCollectionType() { _loadItemCollectionType() {
return require('../../collections/menu/menu-item-collection'); return require('collections/menu/menu-item-collection').MenuItemCollection;
}, },
addItem(item) { addItem(item) {
@ -67,4 +67,4 @@ const MenuItemModel = Backbone.Model.extend({
} }
}); });
module.exports = MenuItemModel; export { MenuItemModel };

18
app/scripts/models/menu/menu-model.js
View File

@ -1,11 +1,11 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const MenuSectionCollection = require('../../collections/menu/menu-section-collection'); import { MenuSectionCollection } from 'collections/menu/menu-section-collection';
const MenuSectionModel = require('./menu-section-model'); import { Colors } from 'const/colors';
const GroupsMenuModel = require('./groups-menu-model'); import { Keys } from 'const/keys';
const Locale = require('../../util/locale'); import { GroupsMenuModel } from 'models/menu/groups-menu-model';
const StringFormat = require('../../util/formatting/string-format'); import { MenuSectionModel } from 'models/menu/menu-section-model';
const Keys = require('../../const/keys'); import { StringFormat } from 'util/formatting/string-format';
const Colors = require('../../const/colors'); import { Locale } from 'util/locale';
const MenuModel = Backbone.Model.extend({ const MenuModel = Backbone.Model.extend({
defaults: { defaults: {
@ -220,4 +220,4 @@ const MenuModel = Backbone.Model.extend({
} }
}); });
module.exports = MenuModel; export { MenuModel };

4
app/scripts/models/menu/menu-option-model.js
View File

@ -1,4 +1,4 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const MenuOptionModel = Backbone.Model.extend({ const MenuOptionModel = Backbone.Model.extend({
defaults: { defaults: {
@ -10,4 +10,4 @@ const MenuOptionModel = Backbone.Model.extend({
} }
}); });
module.exports = MenuOptionModel; export { MenuOptionModel };

8
app/scripts/models/menu/menu-section-model.js
View File

@ -1,7 +1,7 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const MenuItemCollection = require('../../collections/menu/menu-item-collection'); import { MenuItemCollection } from 'collections/menu/menu-item-collection';
const MenuItemModel = Backbone.Model.extend({ const MenuSectionModel = Backbone.Model.extend({
defaults: { defaults: {
items: null, items: null,
scrollable: false, scrollable: false,
@ -56,4 +56,4 @@ const MenuItemModel = Backbone.Model.extend({
} }
}); });
module.exports = MenuItemModel; export { MenuSectionModel };

6
app/scripts/models/runtime-data-model.js
View File

@ -1,5 +1,5 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const SettingsStore = require('../comp/settings/settings-store'); import { SettingsStore } from 'comp/settings/settings-store';
const RuntimeDataModel = Backbone.Model.extend({ const RuntimeDataModel = Backbone.Model.extend({
defaults: {}, defaults: {},
@ -27,4 +27,4 @@ const RuntimeDataModel = Backbone.Model.extend({
RuntimeDataModel.instance = new RuntimeDataModel(); RuntimeDataModel.instance = new RuntimeDataModel();
module.exports = RuntimeDataModel; export { RuntimeDataModel };

6
app/scripts/models/update-model.js
View File

@ -1,5 +1,5 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const SettingsStore = require('../comp/settings/settings-store'); import { SettingsStore } from 'comp/settings/settings-store';
const UpdateModel = Backbone.Model.extend({ const UpdateModel = Backbone.Model.extend({
defaults: { defaults: {
@ -47,4 +47,4 @@ const UpdateModel = Backbone.Model.extend({
UpdateModel.instance = new UpdateModel(); UpdateModel.instance = new UpdateModel();
module.exports = UpdateModel; export { UpdateModel };

2
app/scripts/plugins/plugin-api.js
View File

@ -16,4 +16,4 @@ const PluginApi = {
} }
}; };
module.exports = PluginApi; export { PluginApi };

6
app/scripts/plugins/plugin-collection.js
View File

@ -1,8 +1,8 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const Plugin = require('./plugin'); import { Plugin } from 'plugins/plugin';
const PluginCollection = Backbone.Collection.extend({ const PluginCollection = Backbone.Collection.extend({
model: Plugin model: Plugin
}); });
module.exports = PluginCollection; export { PluginCollection };

14
app/scripts/plugins/plugin-gallery.js
View File

@ -1,9 +1,9 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const kdbxweb = require('kdbxweb'); import kdbxweb from 'kdbxweb';
const Links = require('../const/links'); import { SettingsStore } from 'comp/settings/settings-store';
const SignatureVerifier = require('../util/data/signature-verifier'); import { Links } from 'const/links';
const Logger = require('../util/logger'); import { SignatureVerifier } from 'util/data/signature-verifier';
const SettingsStore = require('../comp/settings/settings-store'); import { Logger } from 'util/logger';
const PluginGallery = { const PluginGallery = {
logger: new Logger('plugin-gallery'), logger: new Logger('plugin-gallery'),
@ -85,4 +85,4 @@ const PluginGallery = {
} }
}; };
module.exports = PluginGallery; export { PluginGallery };

18
app/scripts/plugins/plugin-manager.js
View File

@ -1,11 +1,11 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const Plugin = require('./plugin'); import { RuntimeInfo } from 'comp/app/runtime-info';
const PluginCollection = require('./plugin-collection'); import { SettingsStore } from 'comp/settings/settings-store';
const PluginGallery = require('./plugin-gallery'); import { Plugin } from 'plugins/plugin';
const SettingsStore = require('../comp/settings/settings-store'); import { PluginCollection } from 'plugins/plugin-collection';
const RuntimeInfo = require('../comp/app/runtime-info'); import { PluginGallery } from 'plugins/plugin-gallery';
const SignatureVerifier = require('../util/data/signature-verifier'); import { SignatureVerifier } from 'util/data/signature-verifier';
const Logger = require('../util/logger'); import { Logger } from 'util/logger';
const PluginManager = Backbone.Model.extend({ const PluginManager = Backbone.Model.extend({
UpdateInterval: 1000 * 60 * 60 * 24 * 7, UpdateInterval: 1000 * 60 * 60 * 24 * 7,
@ -235,4 +235,4 @@ const PluginManager = Backbone.Model.extend({
PluginManager.instance = new PluginManager(); PluginManager.instance = new PluginManager();
module.exports = PluginManager; export { PluginManager };

26
app/scripts/plugins/plugin.js
View File

@ -1,15 +1,15 @@
const kdbxweb = require('kdbxweb'); import Backbone from 'backbone';
const Backbone = require('backbone'); import kdbxweb from 'kdbxweb';
const PluginApi = require('./plugin-api'); import BaseLocale from 'locales/base.json';
const ThemeVars = require('./theme-vars'); import { RuntimeInfo } from 'comp/app/runtime-info';
const Logger = require('../util/logger'); import { SettingsManager } from 'comp/settings/settings-manager';
const SettingsManager = require('../comp/settings/settings-manager'); import { AppSettingsModel } from 'models/app-settings-model';
const IoCache = require('../storage/io-cache'); import { PluginApi } from 'plugins/plugin-api';
const AppSettingsModel = require('../models/app-settings-model'); import { ThemeVars } from 'plugins/theme-vars';
const BaseLocale = require('../locales/base.json'); import { IoCache } from 'storage/io-cache';
const SignatureVerifier = require('../util/data/signature-verifier'); import { SemVer } from 'util/data/semver';
const SemVer = require('../util/data/semver'); import { SignatureVerifier } from 'util/data/signature-verifier';
const RuntimeInfo = require('../comp/app/runtime-info'); import { Logger } from 'util/logger';
const commonLogger = new Logger('plugin'); const commonLogger = new Logger('plugin');
const io = new IoCache({ const io = new IoCache({
@ -692,4 +692,4 @@ function httpGet(url, binary) {
}); });
} }
module.exports = Plugin; export { Plugin };

5
app/scripts/plugins/theme-vars.js
View File

@ -1,6 +1,7 @@
import { Color } from 'util/data/color';
const ThemeVarsScss = require('raw-loader!../../styles/base/_theme-vars.scss').default; const ThemeVarsScss = require('raw-loader!../../styles/base/_theme-vars.scss').default;
const ThemeDefaults = require('../../styles/themes/_theme-defaults.scss'); const ThemeDefaults = require('../../styles/themes/_theme-defaults.scss');
const Color = require('../util/data/color');
const ThemeVars = { const ThemeVars = {
themeDefaults: null, themeDefaults: null,
@ -118,4 +119,4 @@ const ThemeVars = {
} }
}; };
module.exports = ThemeVars; export { ThemeVars };

6
app/scripts/presenters/entry-presenter.js
View File

@ -1,5 +1,5 @@
const DateFormat = require('../util/formatting/date-format'); import { DateFormat } from 'util/formatting/date-format';
const Locale = require('../util/locale'); import { Locale } from 'util/locale';
const EntryPresenter = function(descField, noColor, activeEntryId) { const EntryPresenter = function(descField, noColor, activeEntryId) {
this.entry = null; this.entry = null;
@ -88,4 +88,4 @@ EntryPresenter.prototype = {
} }
}; };
module.exports = EntryPresenter; export { EntryPresenter };

6
app/scripts/storage/impl/storage-cache.js
View File

@ -1,5 +1,5 @@
const StorageBase = require('../storage-base'); import { IoBrowserCache } from 'storage/io-browser-cache';
const IoBrowserCache = require('../io-browser-cache'); import { StorageBase } from 'storage/storage-base';
const StorageCache = StorageBase.extend({ const StorageCache = StorageBase.extend({
name: 'cache', name: 'cache',
@ -29,4 +29,4 @@ const StorageCache = StorageBase.extend({
} }
}); });
module.exports = StorageCache; export { StorageCache };

8
app/scripts/storage/impl/storage-dropbox.js
View File

@ -1,6 +1,6 @@
const StorageBase = require('../storage-base'); import { StorageBase } from 'storage/storage-base';
const UrlFormat = require('../../util/formatting/url-format'); import { Features } from 'util/features';
const Features = require('../../util/features'); import { UrlFormat } from 'util/formatting/url-format';
const DropboxKeys = { const DropboxKeys = {
AppFolder: 'qp7ctun6qt5n9d6', AppFolder: 'qp7ctun6qt5n9d6',
@ -376,4 +376,4 @@ const StorageDropbox = StorageBase.extend({
} }
}); });
module.exports = StorageDropbox; export { StorageDropbox };

6
app/scripts/storage/impl/storage-file-cache.js
View File

@ -1,5 +1,5 @@
const StorageBase = require('../storage-base'); import { Launcher } from 'comp/launcher';
const Launcher = require('../../comp/launcher'); import { StorageBase } from 'storage/storage-base';
const StorageFileCache = StorageBase.extend({ const StorageFileCache = StorageBase.extend({
name: 'cache', name: 'cache',
@ -104,4 +104,4 @@ const StorageFileCache = StorageBase.extend({
} }
}); });
module.exports = StorageFileCache; export { StorageFileCache };

6
app/scripts/storage/impl/storage-file.js
View File

@ -1,5 +1,5 @@
const StorageBase = require('../storage-base'); import { Launcher } from 'comp/launcher';
const Launcher = require('../../comp/launcher'); import { StorageBase } from 'storage/storage-base';
const fileWatchers = {}; const fileWatchers = {};
@ -178,4 +178,4 @@ const StorageFile = StorageBase.extend({
} }
}); });
module.exports = StorageFile; export { StorageFile };

6
app/scripts/storage/impl/storage-gdrive.js
View File

@ -1,5 +1,5 @@
const StorageBase = require('../storage-base'); import { StorageBase } from 'storage/storage-base';
const Locale = require('../../util/locale'); import { Locale } from 'util/locale';
const GDriveClientId = { const GDriveClientId = {
Local: '783608538594-36tkdh8iscrq8t8dq87gghubnhivhjp5.apps.googleusercontent.com', Local: '783608538594-36tkdh8iscrq8t8dq87gghubnhivhjp5.apps.googleusercontent.com',
@ -255,4 +255,4 @@ const StorageGDrive = StorageBase.extend({
} }
}); });
module.exports = StorageGDrive; export { StorageGDrive };

4
app/scripts/storage/impl/storage-onedrive.js
View File

@ -1,4 +1,4 @@
const StorageBase = require('../storage-base'); import { StorageBase } from 'storage/storage-base';
const OneDriveClientId = { const OneDriveClientId = {
Production: '000000004818ED3A', Production: '000000004818ED3A',
@ -277,4 +277,4 @@ if (document.querySelectorAll(selector).length === 1) document.querySelector(sel
} }
}); });
module.exports = StorageOneDrive; export { StorageOneDrive };

4
app/scripts/storage/impl/storage-webdav.js
View File

@ -1,4 +1,4 @@
const StorageBase = require('../storage-base'); import { StorageBase } from 'storage/storage-base';
const StorageWebDav = StorageBase.extend({ const StorageWebDav = StorageBase.extend({
name: 'webdav', name: 'webdav',
@ -386,4 +386,4 @@ const StorageWebDav = StorageBase.extend({
} }
}); });
module.exports = StorageWebDav; export { StorageWebDav };

22
app/scripts/storage/index.js
View File

@ -1,11 +1,11 @@
const Launcher = require('../comp/launcher'); import { Launcher } from 'comp/launcher';
const StorageFile = require('./impl/storage-file'); import { StorageCache } from 'storage/impl/storage-cache';
const StorageFileCache = require('./impl/storage-file-cache'); import { StorageDropbox } from 'storage/impl/storage-dropbox';
const StorageCache = require('./impl/storage-cache'); import { StorageFile } from 'storage/impl/storage-file';
const StorageDropbox = require('./impl/storage-dropbox'); import { StorageFileCache } from 'storage/impl/storage-file-cache';
const StorageGDrive = require('./impl/storage-gdrive'); import { StorageGDrive } from 'storage/impl/storage-gdrive';
const StorageOneDrive = require('./impl/storage-onedrive'); import { StorageOneDrive } from 'storage/impl/storage-onedrive';
const StorageWebDav = require('./impl/storage-webdav'); import { StorageWebDav } from 'storage/impl/storage-webdav';
const BuiltInStorage = { const BuiltInStorage = {
file: new StorageFile(), file: new StorageFile(),
@ -19,9 +19,9 @@ const ThirdPartyStorage = {
webdav: new StorageWebDav() webdav: new StorageWebDav()
}; };
const storage = BuiltInStorage; const Storage = BuiltInStorage;
if (!Launcher || Launcher.thirdPartyStoragesSupported) { if (!Launcher || Launcher.thirdPartyStoragesSupported) {
_.extend(storage, ThirdPartyStorage); _.extend(Storage, ThirdPartyStorage);
} }
module.exports = storage; export { Storage };

2
app/scripts/storage/io-browser-cache.js
View File

@ -137,4 +137,4 @@ _.extend(IoBrowserCache.prototype, {
} }
}); });
module.exports = IoBrowserCache; export { IoBrowserCache };

8
app/scripts/storage/io-cache.js
View File

@ -1,5 +1,7 @@
const Launcher = require('../comp/launcher'); import { Launcher } from 'comp/launcher';
import { IoFileCache } from 'storage/io-file-cache';
import { IoBrowserCache } from 'storage/io-browser-cache';
const IoCache = Launcher ? require('./io-file-cache') : require('./io-browser-cache'); const IoCache = Launcher ? IoFileCache : IoBrowserCache;
module.exports = IoCache; export { IoCache };

4
app/scripts/storage/io-file-cache.js
View File

@ -1,4 +1,4 @@
const Launcher = require('../comp/launcher'); import { Launcher } from 'comp/launcher';
const IoFileCache = function(config) { const IoFileCache = function(config) {
this.basePath = null; this.basePath = null;
@ -99,4 +99,4 @@ _.extend(IoFileCache.prototype, {
} }
}); });
module.exports = IoFileCache; export { IoFileCache };

14
app/scripts/storage/storage-base.js
View File

@ -1,9 +1,9 @@
const Backbone = require('backbone'); import Backbone from 'backbone';
const Logger = require('../util/logger'); import { Links } from 'const/links';
const AppSettingsModel = require('../models/app-settings-model'); import { AppSettingsModel } from 'models/app-settings-model';
const RuntimeDataModel = require('../models/runtime-data-model'); import { RuntimeDataModel } from 'models/runtime-data-model';
const Links = require('../const/links'); import { Features } from 'util/features';
const Features = require('../util/features'); import { Logger } from 'util/logger';
const MaxRequestRetries = 3; const MaxRequestRetries = 3;
@ -267,4 +267,4 @@ _.extend(StorageBase.prototype, {
StorageBase.extend = Backbone.Model.extend; StorageBase.extend = Backbone.Model.extend;
module.exports = StorageBase; export { StorageBase };

4
app/scripts/util/data/color.js
View File

@ -1,4 +1,4 @@
const Colors = require('../../const/colors'); import { Colors } from 'const/colors';
const KnownColors = {}; const KnownColors = {};
@ -130,4 +130,4 @@ function hex(num) {
return str.length < 2 ? '0' + str : str; return str.length < 2 ? '0' + str : str;
} }
module.exports = Color; export { Color };

2
app/scripts/util/data/comparators.js
View File

@ -37,4 +37,4 @@ const Comparators = {
} }
}; };
module.exports = Comparators; export { Comparators };

4
app/scripts/util/data/otp.js
View File

@ -1,4 +1,4 @@
const Logger = require('../logger'); import { Logger } from 'util/logger';
const logger = new Logger('otp'); const logger = new Logger('otp');
@ -148,4 +148,4 @@ Otp.makeUrl = function(secret, period, digits) {
); );
}; };
module.exports = Otp; export { Otp };

2
app/scripts/util/data/ranking.js
View File

@ -33,4 +33,4 @@ function indexOf(target, search) {
window.Ranking = Ranking; window.Ranking = Ranking;
module.exports = Ranking; export { Ranking };

2
app/scripts/util/data/semver.js
View File

@ -16,4 +16,4 @@ const SemVer = {
} }
}; };
module.exports = SemVer; export { SemVer };

8
app/scripts/util/data/signature-verifier.js
View File

@ -1,6 +1,6 @@
const Logger = require('../logger'); import kdbxweb from 'kdbxweb';
const publicKey = require('public-key.pem').default; import { Logger } from 'util/logger';
const kdbxweb = require('kdbxweb'); import publicKey from 'public-key.pem';
const SignatureVerifier = { const SignatureVerifier = {
logger: new Logger('signature-verifier'), logger: new Logger('signature-verifier'),
@ -62,4 +62,4 @@ const SignatureVerifier = {
} }
}; };
module.exports = SignatureVerifier; export { SignatureVerifier };

2
app/scripts/util/features.js
View File

@ -37,4 +37,4 @@ const Features = {
} }
}; };
module.exports = Features; export { Features };

Some files were not shown because too many files have changed in this diff Show More