From 99fad5c655eb6184952b93bb7a09a634b64b4ecc Mon Sep 17 00:00:00 2001 From: pavel Date: Fri, 23 Jan 2015 12:39:37 +0000 Subject: [PATCH] expo-16 layout bugs --- .../client/includes/company/company_edit.html | 6 ++- .../static_client/js/_modules/page.company.js | 39 +++++++++++++++++-- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/templates/client/includes/company/company_edit.html b/templates/client/includes/company/company_edit.html index 24bc6e18..7d349604 100644 --- a/templates/client/includes/company/company_edit.html +++ b/templates/client/includes/company/company_edit.html @@ -228,8 +228,10 @@
diff --git a/templates/client/static_client/js/_modules/page.company.js b/templates/client/static_client/js/_modules/page.company.js index 0f7db2be..cf2a7059 100644 --- a/templates/client/static_client/js/_modules/page.company.js +++ b/templates/client/static_client/js/_modules/page.company.js @@ -448,8 +448,8 @@ if (EXPO.company){ } }); - // предазгрузка активных тегов - $('#'+self.opt.selectBox[2].id).attr('data-predifined','[{"id":"1128","text":"тег1"},{"id":"3365","text":"тег2"}]'); + + //$('#'+self.opt.selectBox[2].id).attr('data-predifined','[{"id":"1128","text":"тег1"},{"id":"3365","text":"тег2"}]'); $('#'+self.opt.selectBox[2].id).select2({ placeholder: self.opt.selectBox[2].placeholder, width: '368px', @@ -473,6 +473,7 @@ if (EXPO.company){ results: function (data) { var results = []; + $.each(data, function(index, item){ results.push({ id: item.id, @@ -485,12 +486,42 @@ if (EXPO.company){ initSelection : function(element, callback) { console.log(element); var data = [], + dataObjArr; + if($.trim(element.attr('data-predifined')) != '' && $.trim(element.attr('data-predifined')) != '[]'){ dataObjArr = JSON.parse(element.attr('data-predifined')); - callback(dataObjArr); - + callback(dataObjArr); + } + } }); + $('#'+self.opt.selectBox[2].id).on('change', function (e) { + var $form = $('#tag_form'), + afterAJAX = function (data) { + console.log('response complete'); + console.log(data); + + }, + doAJAX = function (dataToSend) { + var self = this; + if(!dataToSend){ + dataToSend = ''; + } + $.ajax({ + type: 'POST', + url: $form.attr('action'), + data:dataToSend, + processData: false, + contentType: false, + success: function(data) { + afterAJAX(data); + $('#wait-ajax').fadeOut(); + } + }); + }; + console.log('change complete'); + console.log(e.val); + }); // make mask on phone field input initMaskedInput(self.opt.phoneBox);