From 6e5d0b8f6ce53f81c87fbd58ff0029e162409e7e Mon Sep 17 00:00:00 2001 From: booblegum Date: Sat, 24 Dec 2016 16:51:54 +0300 Subject: [PATCH] =?UTF-8?q?PR-50=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=D1=81=D0=BA=D0=B0=D0=B7=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Изменено --- assets/js/build/init_create_worksell.js | 1 + assets/js/build/init_customer_project_create.js | 3 ++- assets/js/src/init_customer_project_create.js | 2 +- assets/lib/proekton-components/js/src/SelectOrCreate.js | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/js/build/init_create_worksell.js b/assets/js/build/init_create_worksell.js index 8257781..093d798 100644 --- a/assets/js/build/init_create_worksell.js +++ b/assets/js/build/init_create_worksell.js @@ -1783,6 +1783,7 @@ this.$buttonCreate.on("click", this._onButtonCreate.bind(self)); this._fillOptionsData(); this._bindEvents(); + this.$searchInput.attr("placeholder", 'Создать/Выбрать объект'); } }, { key: 'getData', diff --git a/assets/js/build/init_customer_project_create.js b/assets/js/build/init_customer_project_create.js index 65b2894..136190a 100644 --- a/assets/js/build/init_customer_project_create.js +++ b/assets/js/build/init_customer_project_create.js @@ -175,7 +175,7 @@ sb_realty_top.hide(); } else { var id = window.location.hash.replace("#", ""); - sb_realty_top.setElementById(id); + if (id) sb_realty_top.setElementById(id); } }); select_realty.on("add", function (args) { @@ -1823,6 +1823,7 @@ this.$buttonCreate.on("click", this._onButtonCreate.bind(self)); this._fillOptionsData(); this._bindEvents(); + this.$searchInput.attr("placeholder", 'Создать/Выбрать объект'); } }, { key: 'getData', diff --git a/assets/js/src/init_customer_project_create.js b/assets/js/src/init_customer_project_create.js index a4cfd7f..20afee6 100644 --- a/assets/js/src/init_customer_project_create.js +++ b/assets/js/src/init_customer_project_create.js @@ -114,7 +114,7 @@ $(function () { sb_realty_top.hide() }else{ let id = window.location.hash.replace("#", ""); - sb_realty_top.setElementById(id); + if (id) sb_realty_top.setElementById(id); } }); select_realty.on("add", (args)=> { diff --git a/assets/lib/proekton-components/js/src/SelectOrCreate.js b/assets/lib/proekton-components/js/src/SelectOrCreate.js index 66f3285..ea8d094 100644 --- a/assets/lib/proekton-components/js/src/SelectOrCreate.js +++ b/assets/lib/proekton-components/js/src/SelectOrCreate.js @@ -44,7 +44,6 @@ export default class SelectOrCreate extends AbsBaseSelect { setLinkBoxes(boxes = []) { this.boxes = boxes; } - _buildComponents(data) { super._buildComponents(data); const self = this; @@ -58,6 +57,7 @@ export default class SelectOrCreate extends AbsBaseSelect { this.$buttonCreate.on("click", this._onButtonCreate.bind(self)); this._fillOptionsData(); this._bindEvents(); + this.$searchInput.attr("placeholder", 'Создать/Выбрать объект') } getData(url, data = {}) {