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

fix enable searching/auto-type

This commit is contained in:
antelle 2016-04-17 17:00:58 +03:00
parent 23b0fe4607
commit 566c322e22
2 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,20 +157,66 @@ var GroupModel = MenuItemModel.extend({
setEnableSearching: function(enabled) {
this._groupModified();
var parentEnableSearching = true;
var parentGroup = this.parentGroup;
while (parentGroup) {
if (typeof parentGroup.get('enableSearching') === 'boolean') {
parentEnableSearching = parentGroup.get('enableSearching');
break;
}
parentGroup = parentGroup.parentGroup;
}
if (enabled === parentEnableSearching) {
enabled = undefined;
}
this.group.enableSearching = enabled;
this.set('enableSearching', enabled);
this.set('enableSearching', this.group.enableSearching);
},
getEffectiveEnableSearching: function() {
var grp = this;
while (grp) {
if (typeof grp.get('enableSearching') === 'boolean') {
return grp.get('enableSearching');
}
grp = grp.parentGroup;
}
return true;
},
setEnableAutoType: function(enabled) {
this._groupModified();
var parentEnableAutoType = true;
var parentGroup = this.parentGroup;
while (parentGroup) {
if (typeof parentGroup.get('enableAutoType') === 'boolean') {
parentEnableAutoType = parentGroup.get('enableAutoType');
break;
}
parentGroup = parentGroup.parentGroup;
}
if (enabled === parentEnableAutoType) {
enabled = undefined;
}
this.group.enableAutoType = enabled;
this.set('enableAutoType', enabled);
this.set('enableAutoType', this.group.enableAutoType);
},
getEffectiveEnableAutoType: function() {
var grp = this;
while (grp) {
if (typeof grp.get('enableAutoType') === 'boolean') {
return grp.get('enableAutoType');
}
grp = grp.parentGroup;
}
return true;
},
setAutoTypeSeq: function(seq) {
this._groupModified();
this.group.defaultAutoTypeSeq = seq || undefined;
this.set('autoTypeSeq', seq || undefined);
this.set('autoTypeSeq', this.group.defaultAutoTypeSeq);
},
moveToTrash: function() {

4
app/scripts/views/grp-view.js
View File

@ -29,11 +29,11 @@ var GrpView = Backbone.View.extend({
title: this.model.get('title'),
icon: this.model.get('icon') || 'folder',
customIcon: this.model.get('customIcon'),
enableSearching: this.model.get('enableSearching') !== false,
enableSearching: this.model.getEffectiveEnableSearching(),
readonly: this.model.get('top'),
canAutoType: !!Launcher,
autoTypeSeq: this.model.get('autoTypeSeq'),
autoTypeEnabled: this.model.get('enableAutoType') !== false
autoTypeEnabled: this.model.getEffectiveEnableAutoType()
}, { plain: true });
if (!this.model.get('title')) {
this.$el.find('#grp__field-title').focus();