expo-16 layout bugs

remotes/origin/1203
pavel 11 years ago
parent 3a1710fa11
commit 99fad5c655
  1. 6
      templates/client/includes/company/company_edit.html
  2. 39
      templates/client/static_client/js/_modules/page.company.js

@ -228,8 +228,10 @@
<hr />
<div class="add_link_teg">
<div class="tag-select">{{ tag_form.tag }}</div>
<form id="tag_form" action="/company/update/tag/{{ company.url }}/" method="post">
{% csrf_token %}
<div class="tag-select">{{ tag_form.tag }}</div>
</form>
<b>+5</b>
</div>

@ -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);

Loading…
Cancel
Save