expo-33 place field bug

remotes/origin/1203
pavel 11 years ago
parent dd320943e3
commit a391884bb3
  1. 17
      templates/client/static_client/js/_modules/block.search.js
  2. 17
      templates/client/static_client/js/_modules/page.events.feed.js
  3. 2
      templates/client/static_client/js_min/_modules/block.search.min.js
  4. 2
      templates/client/static_client/js_min/_modules/page.events.feed.min.js

@ -928,6 +928,18 @@ if (EXPO.searchBlock){
return false;
}
},
allHighestSelected = function () {
//var DOMselected = DOMSublist.querySelectorAll('.'+checkboxClass+':checked'),
var $selected = $(DOMHighestSublist).children('li').children('.'+fakeCheckboxClass).find('.'+checkboxClass+':checked'),
selectedCount = $selected.length,
allCount = $(DOMHighestSublist).children('li').children('.'+fakeCheckboxClass).find('.'+checkboxClass).length;
if(allCount == selectedCount && selectedCount != 0){
return true;
} else{
return false;
}
},
parentSelected = function () {
var parentCheckbox = DOMParentItem.querySelector('.'+checkboxClass);
if(parentCheckbox.checked){
@ -1072,6 +1084,11 @@ if (EXPO.searchBlock){
selectItem(DOMHighestCheckbox);
refreshTags(DOMHighestCheckbox);
createTag(DOMHighestCheckbox);
//если только что вклбченный чекбокс дополняет остальные включенные чекбоксы, то включается самый верхний чекбокс
}else if(allHighestSelected()){
selectItem(DOMHighestCheckbox);
refreshTags(DOMHighestCheckbox);
createTag(DOMHighestCheckbox);
}
}else{
selectItem(this);

@ -909,6 +909,18 @@ if (EXPO.events.feed) {
return false;
}
},
allHighestSelected = function () {
//var DOMselected = DOMSublist.querySelectorAll('.'+checkboxClass+':checked'),
var $selected = $(DOMHighestSublist).children('li').children('.'+fakeCheckboxClass).find('.'+checkboxClass+':checked'),
selectedCount = $selected.length,
allCount = $(DOMHighestSublist).children('li').children('.'+fakeCheckboxClass).find('.'+checkboxClass).length;
if(allCount == selectedCount && selectedCount != 0){
return true;
} else{
return false;
}
},
parentSelected = function () {
var parentCheckbox = DOMParentItem.querySelector('.'+checkboxClass);
if(parentCheckbox.checked){
@ -1053,6 +1065,11 @@ if (EXPO.events.feed) {
selectItem(DOMHighestCheckbox);
refreshTags(DOMHighestCheckbox);
createTag(DOMHighestCheckbox);
//если только что вклбченный чекбокс дополняет остальные включенные чекбоксы, то включается самый верхний чекбокс
}else if(allHighestSelected()){
selectItem(DOMHighestCheckbox);
refreshTags(DOMHighestCheckbox);
createTag(DOMHighestCheckbox);
}
}else{
selectItem(this);

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save