diff --git a/assets/lib/proekton-components/css/select-box.css b/assets/lib/proekton-components/css/select-box.css index f7804d6..b090ec6 100644 --- a/assets/lib/proekton-components/css/select-box.css +++ b/assets/lib/proekton-components/css/select-box.css @@ -135,6 +135,7 @@ input.select-box-search:-webkit-autofill { } .select-box-results .other-part { + border-right: 1px solid #cccccc; border-top: 1px solid #000000; color: darkgray; } diff --git a/assets/lib/proekton-components/js/build/init.js b/assets/lib/proekton-components/js/build/init.js index 0e7f01b..e2e9927 100644 --- a/assets/lib/proekton-components/js/build/init.js +++ b/assets/lib/proekton-components/js/build/init.js @@ -304,13 +304,16 @@ var TreeSelect = function (_AbsBaseSelect) { value: function _onclickOptionsElement(e) { this.clearAllNext(); _get(TreeSelect.prototype.__proto__ || Object.getPrototypeOf(TreeSelect.prototype), '_onclickOptionsElement', this).call(this, e); - if (this.prevSelectBox && this.dataTree.hasChildren(this.selectedEl.id)) this.$searchInput.removeClass('active'); if (this.nextSelectBox && this.dataTree.hasChildren(this.selectedEl.id)) { this.nextSelectBox.setParent(this.selectedEl.id); this.nextSelectBox.setHeader(this.selectedEl.value); this.nextSelectBox.show(); } - if (this.prevSelectBox) this.prevSelectBox.$buttonAddOptions.hide(); + if (this.prevSelectBox) { + this.prevSelectBox.$buttonAddOptions.hide(); + this.prevSelectBox.$searchInput.removeClass("active"); + } + this.$searchInput.addClass('active'); } }, { key: '_onButtonAddOptions', @@ -516,6 +519,7 @@ var AbsBaseSelect = function () { this.$editableContainer.html(""); this.$editableContainer.hide(); } + this.$searchInput.removeClass("active"); } }, { key: "hide", @@ -544,7 +548,6 @@ var AbsBaseSelect = function () { value: function setParent(parentId) { this.parentId = parentId; this._fillOptionsData(); - this.$searchInput.addClass('active'); } }, { key: "connectSelectedContainer", @@ -747,7 +750,6 @@ var AbsBaseSelect = function () { value: function _onButtonAddOptions(e) { this._addToSelectedContainer(this.selectedEl.id); this.clear(); - this.$searchInput.removeClass('active'); e.preventDefault(); return false; } @@ -793,7 +795,6 @@ var AbsBaseSelect = function () { this.$searchInput.on("click", function (e) { self.$optionsBox.show(); self.$resultsBox.hide(); - self.$buttonAddOptions.hide(); self.$searchInput.val(""); }); diff --git a/assets/lib/proekton-components/js/src/TreeSelect.js b/assets/lib/proekton-components/js/src/TreeSelect.js index 0dd6774..ffb2433 100644 --- a/assets/lib/proekton-components/js/src/TreeSelect.js +++ b/assets/lib/proekton-components/js/src/TreeSelect.js @@ -42,13 +42,16 @@ export default class TreeSelect extends AbsBaseSelect{ _onclickOptionsElement(e) { this.clearAllNext(); super._onclickOptionsElement(e); - if (this.prevSelectBox && this.dataTree.hasChildren(this.selectedEl.id)) this.$searchInput.removeClass('active'); if (this.nextSelectBox && this.dataTree.hasChildren(this.selectedEl.id)) { this.nextSelectBox.setParent(this.selectedEl.id); this.nextSelectBox.setHeader(this.selectedEl.value); this.nextSelectBox.show(); } - if (this.prevSelectBox) this.prevSelectBox.$buttonAddOptions.hide(); + if (this.prevSelectBox) { + this.prevSelectBox.$buttonAddOptions.hide(); + this.prevSelectBox.$searchInput.removeClass("active"); + } + this.$searchInput.addClass('active'); } _onButtonAddOptions(e) { diff --git a/assets/lib/proekton-components/js/src/base/AbsBaseSelect.js b/assets/lib/proekton-components/js/src/base/AbsBaseSelect.js index dda4f8e..618efa6 100644 --- a/assets/lib/proekton-components/js/src/base/AbsBaseSelect.js +++ b/assets/lib/proekton-components/js/src/base/AbsBaseSelect.js @@ -203,6 +203,7 @@ export default class AbsBaseSelect { this.$editableContainer.html(""); this.$editableContainer.hide() } + this.$searchInput.removeClass("active"); } hide() { @@ -223,7 +224,6 @@ export default class AbsBaseSelect { setParent(parentId) { this.parentId = parentId; this._fillOptionsData(); - this.$searchInput.addClass('active'); } connectSelectedContainer(selectedContainer) { @@ -368,7 +368,6 @@ export default class AbsBaseSelect { _onButtonAddOptions(e) { this._addToSelectedContainer(this.selectedEl.id); this.clear(); - this.$searchInput.removeClass('active'); e.preventDefault(); return false; } @@ -411,7 +410,6 @@ export default class AbsBaseSelect { this.$searchInput.on("click", function (e) { self.$optionsBox.show(); self.$resultsBox.hide(); - self.$buttonAddOptions.hide(); self.$searchInput.val(""); }); diff --git a/projects/templates/partials/inc-projects-filter.html b/projects/templates/partials/inc-projects-filter.html index 79f5c3b..0982a06 100644 --- a/projects/templates/partials/inc-projects-filter.html +++ b/projects/templates/partials/inc-projects-filter.html @@ -72,7 +72,8 @@