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

Allow custom advancedSearch in settings json

This commit is contained in:
ik9999 2018-12-30 22:03:02 +03:00
parent e07777179f
commit 5e57938aab
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ const AppModel = Backbone.Model.extend({
this.settings = AppSettingsModel.instance;
this.activeEntryId = null;
this.isBeta = RuntimeInfo.beta;
this.advancedSearch = null;
this.listenTo(Backbone, 'refresh', this.refresh);
this.listenTo(Backbone, 'set-filter', this.setFilter);
@ -132,6 +133,10 @@ const AppModel = Backbone.Model.extend({
this.settings.set(config.settings);
});
}
if (config.advancedSearch) {
this.advancedSearch = config.advancedSearch;
this.addFilter({advanced: this.advancedSearch});
}
},
addFile: function(file) {

16
app/scripts/views/list-search-view.js
View File

@ -57,6 +57,9 @@ const ListSearchView = Backbone.View.extend({
cs: false, regex: false,
history: false, title: true
};
if (this.model.advancedSearch) {
this.advancedSearch = _.extend({}, this.model.advancedSearch);
}
this.setLocale();
KeyHandler.onKey(Keys.DOM_VK_F, this.findKeyPress, this, KeyHandler.SHORTCUT_ACTION);
KeyHandler.onKey(Keys.DOM_VK_N, this.newKeyPress, this, KeyHandler.SHORTCUT_OPT);
@ -199,7 +202,10 @@ const ListSearchView = Backbone.View.extend({
}
const sortIconCls = this.sortIcons[filter.sort] || 'sort';
this.$el.find('.list__search-btn-sort>i').attr('class', 'fa fa-' + sortIconCls);
const adv = !!filter.filter.advanced;
let adv = !!filter.filter.advanced;
if (this.model.advancedSearch) {
adv = filter.filter.advanced !== this.model.advancedSearch;
}
if (this.advancedSearchEnabled !== adv) {
this.advancedSearchEnabled = adv;
this.$el.find('.list__search-adv').toggleClass('hide', !this.advancedSearchEnabled);
@ -224,7 +230,13 @@ const ListSearchView = Backbone.View.extend({
advancedSearchClick: function() {
this.advancedSearchEnabled = !this.advancedSearchEnabled;
this.$el.find('.list__search-adv').toggleClass('hide', !this.advancedSearchEnabled);
Backbone.trigger('add-filter', { advanced: this.advancedSearchEnabled ? this.advancedSearch : false });
let advanced = false;
if (this.advancedSearchEnabled) {
advanced = this.advancedSearch;
} else if (this.model.advancedSearch) {
advanced = this.model.advancedSearch;
}
Backbone.trigger('add-filter', { advanced });
},
toggleMenu: function() {