diff --git a/app/scripts/models/group-model.js b/app/scripts/models/group-model.js index 85554965..437e124e 100644 --- a/app/scripts/models/group-model.js +++ b/app/scripts/models/group-model.js @@ -16,7 +16,8 @@ var GroupModel = MenuItemModel.extend({ editable: true, top: false, drag: true, - drop: true + drop: true, + enableSearching: true }), initialize: function() { @@ -33,6 +34,7 @@ var GroupModel = MenuItemModel.extend({ items: new GroupCollection(), entries: new EntryCollection(), filterValue: group.uuid.id, + enableSearching: group.enableSearching, top: !parentGroup, drag: !!parentGroup }, { silent: true }); @@ -150,6 +152,12 @@ var GroupModel = MenuItemModel.extend({ this.set('expanded', expanded); }, + setEnableSearching: function(enabled) { + this._groupModified(); + this.group.enableSearching = enabled; + this.set('enableSearching', enabled); + }, + moveToTrash: function() { this.file.setModified(); this.file.db.remove(this.group); diff --git a/app/scripts/views/grp-view.js b/app/scripts/views/grp-view.js index b33cc184..c8eafe31 100644 --- a/app/scripts/views/grp-view.js +++ b/app/scripts/views/grp-view.js @@ -12,7 +12,8 @@ var GrpView = Backbone.View.extend({ 'click .grp__icon': 'showIconsSelect', 'click .grp__buttons-trash': 'moveToTrash', 'click .grp__back-button': 'returnToApp', - 'blur #grp__field-title': 'titleBlur' + 'blur #grp__field-title': 'titleBlur', + 'change #grp__check-search': 'setEnableSearching' }, initialize: function() { @@ -26,6 +27,7 @@ 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, readonly: this.model.get('top') })); if (!this.model.get('title')) { @@ -107,6 +109,11 @@ var GrpView = Backbone.View.extend({ Backbone.trigger('select-all'); }, + setEnableSearching: function(e) { + var enabled = e.target.checked; + this.model.setEnableSearching(enabled); + }, + returnToApp: function() { Backbone.trigger('edit-group'); } diff --git a/app/styles/base/_forms.scss b/app/styles/base/_forms.scss index 45a40edf..929b3a6f 100644 --- a/app/styles/base/_forms.scss +++ b/app/styles/base/_forms.scss @@ -155,7 +155,7 @@ option { input[type=checkbox] { display: none; - & + label:hover:before { + &:not([disabled]) + label:hover:before { @include th { color: action-color(); } diff --git a/app/templates/grp.html b/app/templates/grp.html index 5e04f351..bcce46ba 100644 --- a/app/templates/grp.html +++ b/app/templates/grp.html @@ -9,6 +9,12 @@ /> + <% if (!readonly) { %> +
+ /> + +
+ <% } %> <% if (customIcon) { %> diff --git a/release-notes.md b/release-notes.md index 28db7bf8..bbeeac11 100644 --- a/release-notes.md +++ b/release-notes.md @@ -6,6 +6,7 @@ Release notes `*` default theme is now blue `+` #46: option to show colorful icons `+` #45: optional auto-lock on minimize +`+` option to disable searching for group `-` #55: custom scrollbar issues ##### v0.4.6 (2015-11-25)