@ -312,12 +312,9 @@ if (EXPO.events.feed) {
} }
return false ; return false ;
} ) ; } ) ;
$ ( '#' + self . opt . deleteId ) . on ( 'click' , function ( ) { $ ( '.del-on-page' ) . on ( 'click' , function ( ) {
$ ( '.' + self . opt . deleteTagClass , $modal ) . trigger ( 'click' ) ; var dataCheckboxId = $ ( this ) . attr ( 'data-checkbox-id' ) ;
} ) ; $ ( '.' + self . opt . deleteTagClass + '[data-checkbox-id="' + dataCheckboxId + '"]' , $modal ) . trigger ( 'click' ) ;
$ ( '.clear' , $modal ) . on ( 'click' , function ( ) {
self . resetList ( ) ;
return false ;
} ) ; } ) ;
self . _autocompleteInit ( ) ; self . _autocompleteInit ( ) ;
$ ( '.' + applyBtnClass , $modal ) . on ( 'click' , function ( ) { $ ( '.' + applyBtnClass , $modal ) . on ( 'click' , function ( ) {
@ -326,8 +323,10 @@ if (EXPO.events.feed) {
} ) ; } ) ;
// кнопка "очистить параметры"
// кнопка "очистить параметры"
$modalTrigger . siblings ( '.' + self . opt . clearAllButtonClass ) . on ( 'click' , function ( ) { $ ( '.' + self . opt . clearAllButtonClass , $modal ) . on ( 'click' , function ( e ) {
e . preventDefault ( ) ;
self . resetList ( ) ; self . resetList ( ) ;
return false ;
} ) ; } ) ;
} ) ; } ) ;
} ; } ;
@ -665,14 +664,17 @@ if (EXPO.events.feed) {
var self = this ; var self = this ;
for ( var key in self . itemsSelected ) { for ( var key in self . itemsSelected ) {
if ( self . itemsSelected . hasOwnProperty ( key ) ) { if ( self . itemsSelected . hasOwnProperty ( key ) ) {
$ ( '#' + key , self . $selfContainer ) . prop ( 'checked' , false ) . trigger ( 'chang e') ; $ ( '#' + key , self . $selfContainer ) . prop ( 'checked' , false ) . closest ( '.custom-radio-check' ) . removeClass ( 'activ e') ;
dna . destroy ( self . itemsSelected [ key ] ) ; dna . destroy ( self . itemsSelected [ key ] ) ;
dna . destroy ( self . tagsBoxItems [ key ] ) ;
} }
} }
$ ( '.sublist' , self . $modalInst ) . addClass ( 'hidden' ) ; $ ( '.level.active' , this . $modal ) . removeClass ( 'active' ) ;
$ ( '.level' , self . $modalInst ) . removeClass ( 'active' ) ; this . _refreshLabel ( ) ;
self . $selectedItemsWrap . removeClass ( 'visible' ) ;
this . $selectedItemsWrap . removeClass ( 'visible' ) ;
} , } ,
/ * * / * *
* render label text , if there is no selected element then text will be default * render label text , if there is no selected element then text will be default
@ -689,6 +691,7 @@ if (EXPO.events.feed) {
} , } ,
// кнопка применить
// кнопка применить
applyHandler : function ( it ) { applyHandler : function ( it ) {
EXPO . events . feed . modalWindow . close ( ) ;
} }
@ -827,39 +830,42 @@ if (EXPO.events.feed) {
DOMParentRow = com . closest ( this , itemClass ) , DOMParentRow = com . closest ( this , itemClass ) ,
DOMParentItem = com . hasClass ( DOMParentRow , highestItemClass ) == false ? com . closest ( DOMParentRow . parentNode , itemClass ) : DOMParentRow , DOMParentItem = com . hasClass ( DOMParentRow , highestItemClass ) == false ? com . closest ( DOMParentRow . parentNode , itemClass ) : DOMParentRow ,
DOMParentCheckbox = DOMParentItem . querySelector ( '.' + checkboxClass ) , DOMParentCheckbox = DOMParentItem . querySelector ( '.' + checkboxClass ) ,
DOMSublist = DOMParentItem . querySelector ( '.' + sublistClass ) , DOMSublist = DOMParentItem . querySelector ( '.' + sublistClass ) ,
DOMSublistInner = DOMParentRow . querySelector ( '.' + sublistClass ) , DOMSublistInner = DOMParentRow . querySelector ( '.' + sublistClass ) ,
DOMHighestItem = com . closest ( this , highestItemClass ) , DOMHighestItem = com . closest ( this , highestItemClass ) ,
DOMHighestCheckbox = DOMHighestItem . querySelector ( '.' + checkboxClass ) , DOMHighestCheckbox = DOMHighestItem . querySelector ( '.' + checkboxClass ) ,
DOMHighestSublist = DOMHighestItem . querySelector ( '.' + sublistClass ) ,
selectSublist = function ( it ) { selectSublist = function ( it ) {
var DOMParentItem = com . closest ( it , itemClass ) || this , var DOMParentItem = com . closest ( it , itemClass ) || this ,
DOMSublist = DOMParentItem . querySelector ( '.' + sublistClass ) ; DOMSublist = DOMParentItem . querySelector ( '.' + sublistClass ) ;
$ ( '.' + checkboxClass , DOMSublist ) . each ( function ( ) { $ ( '.' + checkboxClass , DOMSublist ) . each ( function ( ) {
selectItem ( this ) ; selectItem ( this ) ;
} ) ; } ) ;
} , } ,
unSelectSublist = function ( it ) { unSelectSublist = function ( it ) {
var DOMParentItem = com . closest ( it , itemClass ) || this , var DOMParentItem = com . closest ( it , itemClass ) || this ,
DOMSublist = DOMParentItem . querySelector ( '.' + sublistClass ) ; DOMSublist = DOMParentItem . querySelector ( '.' + sublistClass ) ;
$ ( '.' + checkboxClass , DOMSublist ) . each ( function ( ) { $ ( '.' + checkboxClass , DOMSublist ) . each ( function ( ) {
unSelectItem ( this ) ; unSelectItem ( this ) ;
} ) ; } ) ;
} , } ,
selectParent = function ( it ) { selectParent = function ( it ) {
var DOMParentRow = com . closest ( it , itemClass ) , var DOMParentRow = com . closest ( it , itemClass ) ,
DOMParentItem ; DOMParentItem ;
if ( com . hasClass ( DOMParentRow , 'level1' ) ) { if ( com . hasClass ( DOMParentRow , 'level1' ) ) {
DOMParentItem = DOMParentRow ; DOMParentItem = DOMParentRow ;
} else { } else {
DOMParentItem = com . closest ( DOMParentRow . parentNode , itemClass ) ; DOMParentItem = com . closest ( DOMParentRow . parentNode , itemClass ) ;
} }
com . addClass ( DOMParentItem . querySelector ( '.' + fakeCheckboxClass ) , activeClass ) ; com . addClass ( DOMParentItem . querySelector ( '.' + fakeCheckboxClass ) , activeClass ) ;
DOMParentItem . querySelector ( '.' + checkboxClass ) . checked = true ; DOMParentItem . querySelector ( '.' + checkboxClass ) . checked = true ;
//it.selected = true;
//it.selected = true;
@ -868,8 +874,8 @@ if (EXPO.events.feed) {
var DOMParentRow = com . closest ( it , itemClass ) , var DOMParentRow = com . closest ( it , itemClass ) ,
DOMParentItem = com . closest ( DOMParentRow . parentNode , itemClass ) || DOMParentRow ; DOMParentItem = com . closest ( DOMParentRow . parentNode , itemClass ) || DOMParentRow ;
com . removeClass ( DOMParentItem . querySelector ( '.' + fakeCheckboxClass ) , activeClass ) ; com . removeClass ( DOMParentItem . querySelector ( '.' + fakeCheckboxClass ) , activeClass ) ;
DOMParentItem . querySelector ( '.' + checkboxClass ) . checked = false ; DOMParentItem . querySelector ( '.' + checkboxClass ) . checked = false ;
//it.checked = false;
//it.checked = false;
} , } ,
@ -880,97 +886,110 @@ if (EXPO.events.feed) {
} , } ,
unSelectItem = function ( it ) { unSelectItem = function ( it ) {
var itFakeCheckbox = com . closest ( it , fakeCheckboxClass ) ; var itFakeCheckbox = com . closest ( it , fakeCheckboxClass ) ,
DOMitem = com . closest ( it , itemClass ) ;
com . removeClass ( itFakeCheckbox , activeClass ) ; com . removeClass ( itFakeCheckbox , activeClass ) ;
it . checked = false ; it . checked = false ;
// if there is children items
if ( DOMitem . querySelector ( '.' + sublistClass ) && ! com . hasClass ( DOMitem , highestItemClass ) ) {
unSelectSublist ( it ) ;
}
} , } ,
allChildrenSelected = function ( ) { allChildrenSelected = function ( ) {
//var DOMselected = DOMSublist.querySelectorAll('.'+checkboxClass+':checked'),
//var DOMselected = DOMSublist.querySelectorAll('.'+checkboxClass+':checked'),
var DOMSublistParent = com . closest ( DOMSublist , sublistClass ) , var DOMSublistParent = com . closest ( DOMSublist , sublistClass ) ,
$selected = $ ( DOMSublist ) . children ( 'li' ) . children ( '.' + fakeCheckboxClass ) . find ( '.' + checkboxClass + ':checked' ) , $selected = $ ( DOMSublist ) . children ( 'li' ) . children ( '.' + fakeCheckboxClass ) . find ( '.' + checkboxClass + ':checked' ) ,
selectedCount = $selected . length , selectedCount = $selected . length ,
//allCount = DOMSublist.querySelectorAll('.'+checkboxClass).length;
//allCount = DOMSublist.querySelectorAll('.'+checkboxClass).length;
allCount = $ ( DOMSublist ) . children ( 'li' ) . children ( '.' + fakeCheckboxClass ) . find ( '.' + checkboxClass ) . length ; allCount = $ ( DOMSublist ) . children ( 'li' ) . children ( '.' + fakeCheckboxClass ) . find ( '.' + checkboxClass ) . length ;
if ( allCount == selectedCount && selectedCount != 0 ) { if ( allCount == selectedCount && selectedCount != 0 ) {
return true ; return true ;
} else { } else {
return false ; return false ;
} }
} , } ,
parentSelected = function ( ) { parentSelected = function ( ) {
var parentCheckbox = DOMParentItem . querySelector ( '.' + checkboxClass ) ; var parentCheckbox = DOMParentItem . querySelector ( '.' + checkboxClass ) ;
if ( parentCheckbox . checked ) { if ( parentCheckbox . checked ) {
return true ; return true ;
} else { } else {
return false ; return false ;
} }
} , } ,
// Функционал добавления тегов: если есть в панели выбранный элемент либо его дочерние то удалить эти эдементы и разместить выбранный ; иначе разместить выбранные.
// Функционал добавления тегов: если есть в панели выбранный элемент либо его дочерние то удалить эти эдементы;
refreshTags = function ( it ) { refreshTags = function ( it ) {
var DOMSublist = com . closest ( it , sublistClass ) ; var DOMSublist = com . closest ( it , sublistClass ) ;
var DOMItem = com . closest ( it , itemClass ) ; var DOMItem = com . closest ( it , itemClass ) ;
var DOMSublistInner = DOMItem . querySelector ( '.' + sublistClass ) ; var DOMSublistInner = DOMItem . querySelector ( '.' + sublistClass ) ;
var DOMAllTags = DOMTagsWrapper . querySelectorAll ( '.' + tagClass ) ; var DOMAllTags = DOMTagsWrapper . querySelectorAll ( '.' + tagClass ) ;
var ARRsublist ; var ARRsublist ;
var ARRsublistChildren = DOMSublist . querySelector ( '.' + sublistClass ) ? $ ( '.' + checkboxClass + ':checked' , DOMSublist . querySelector ( '.' + sublistClass ) ) : null ; var ARRsublistChildren = DOMSublist . querySelector ( '.' + sublistClass ) ? $ ( '.' + checkboxClass + ':checked' , DOMSublist . querySelector ( '.' + sublistClass ) ) : null ;
var ARRsublistChildrenLength = ARRsublistChildren ? ARRsublistChildren . length : null ; var ARRsublistChildrenLength = ARRsublistChildren ? ARRsublistChildren . length : null ;
var ARRSublistIds = [ ] ; var ARRSublistIds = [ ] ;
var ARRAllTagsIds = [ ] ; var ARRAllTagsIds = [ ] ;
var allTagsLength = 0 ; var allTagsLength = 0 ;
var sublistIdsLength = 0 ; var sublistIdsLength = 0 ;
var itId = it . getAttribute ( 'id' ) ; var itId = it . getAttribute ( 'id' ) ;
var i = 0 , j = 0 , t = 0 , tmp , k = 0 ; var i = 0 , j = 0 , t = 0 , tmp , k = 0 ;
var tagId ; var tagId ;
var tagText = DOMParentRow . querySelector ( '.' + triggerClass ) . innerHTML ; var tagText = DOMParentRow . querySelector ( '.' + triggerClass ) . innerHTML ;
// если есть дочерние элементы
// если есть дочерние элементы
if ( DOMSublistInner ) { if ( DOMSublistInner ) {
ARRsublist = $ ( DOMSublistInner ) . children ( 'li' ) . children ( '.' + fakeCheckboxClass ) . find ( '.' + checkboxClass + ':checked' ) ARRsublist = $ ( DOMSublistInner ) . children ( 'li' ) . children ( '.' + fakeCheckboxClass ) . find ( '.' + checkboxClass + ':checked' )
//получаем массив id жлементовЮ для которых есть тег
//получаем массив id жлементовЮ для которых есть тег
for ( k ; k < ARRsublist . length ; k ++ ) { for ( k ; k < ARRsublist . length ; k ++ ) {
tmp = ARRsublist [ k ] . getAttribute ( 'id' ) ; tmp = ARRsublist [ k ] . getAttribute ( 'id' ) ;
ARRSublistIds . push ( tmp ) ; ARRSublistIds . push ( tmp ) ;
} }
//очистк
//очистк
for ( t ; t < DOMAllTags . length ; t ++ ) { for ( t ; t < DOMAllTags . length ; t ++ ) {
tmp = DOMAllTags [ t ] . querySelector ( '.' + tagButtonClass ) . getAttribute ( tagIdAttribute ) ; tmp = DOMAllTags [ t ] . querySelector ( '.' + tagButtonClass ) . getAttribute ( tagIdAttribute ) ;
if ( tmp != '~~id~~' ) { if ( tmp != '~~id~~' ) {
ARRAllTagsIds . push ( tmp ) ; ARRAllTagsIds . push ( tmp ) ;
} }
} }
allTagsLength = ARRAllTagsIds . length ; allTagsLength = ARRAllTagsIds . length ;
sublistIdsLength = ARRSublistIds . length ; sublistIdsLength = ARRSublistIds . length ;
// добавить текущий тег
//если найден дочерний тег то он будет удален, либо текущий тег
//если найден дочерний тег то он будет удален, либо текущий тег
for ( i = 0 ; i < allTagsLength ; i ++ ) { for ( i = 0 ; i < allTagsLength ; i ++ ) {
tagId = ARRAllTagsIds [ i ] ; tagId = ARRAllTagsIds [ i ] ;
for ( j = 0 ; j < sublistIdsLength ; j ++ ) { for ( j = 0 ; j < sublistIdsLength ; j ++ ) {
if ( tagId == ARRSublistIds [ j ] ) { if ( tagId == ARRSublistIds [ j ] ) {
deleteTag ( ARRsublist [ j ] ) ; deleteTag ( ARRsublist [ j ] ) ;
} }
} }
} }
// удаление дубликатов текущего элемента
// удаление дубликатов текущего элемента
for ( i = 0 ; i < allTagsLength ; i ++ ) { for ( i = 0 ; i < allTagsLength ; i ++ ) {
tagId = ARRAllTagsIds [ i ] ; tagId = ARRAllTagsIds [ i ] ;
if ( tagId == itId ) { if ( tagId == itId ) {
deleteTag ( it ) ; deleteTag ( it ) ;
} }
} }
} else { // удаление дочерних тегов 2го уровня
if ( DOMSublistInner . querySelectorAll ( '.final-tire' ) ) {
$ ( '.' + fakeCheckboxClass + '.' + activeClass , DOMSublistInner . querySelectorAll ( '.final-tire' ) ) . each ( function ( ) {
deleteTag ( $ ( '.' + checkboxClass , this ) [ 0 ] ) ;
} ) ;
}
} else {
// удаление дубликатов текущего элемента
// удаление дубликатов текущего элемента
for ( i = 0 ; i < allTagsLength ; i ++ ) { for ( i = 0 ; i < allTagsLength ; i ++ ) {
tagId = ARRAllTagsIds [ i ] ; tagId = ARRAllTagsIds [ i ] ;
if ( tagId == itId ) { if ( tagId == itId ) {
deleteTag ( itId ) ; deleteTag ( itId ) ;
} }
} }
} }
} , } ,
deleteTag = function ( it ) { deleteTag = function ( it ) {
var id = it . getAttribute ( 'id' ) ; var id = it . getAttribute ( 'id' ) ;
@ -978,84 +997,111 @@ if (EXPO.events.feed) {
tagsPanelToggle ( ) ; tagsPanelToggle ( ) ;
} , } ,
createTag = function ( it ) { createTag = function ( it ) {
var item = com . closest ( it , itemClass ) , var item = com . closest ( it , itemClass ) ,
tagTrigger = item . querySelector ( '.' + triggerClass ) , tagTrigger = item . querySelector ( '.' + triggerClass ) ,
tagText = tagTrigger . innerHTML , tagText = tagTrigger . innerHTML ,
id = it . getAttribute ( 'id' ) , id = it . getAttribute ( 'id' ) ,
tagObj = { 'id' : id , 'text' : tagText } ; tagObj = { 'id' : id , 'text' : tagText } ;
self . _addTag ( id , tagObj ) ; self . _addTag ( id , tagObj ) ;
tagsPanelToggle ( ) ; tagsPanelToggle ( ) ;
} , } ,
tagsPanelToggle = function ( ) { tagsPanelToggle = function ( ) {
if ( $selectedItemsWrap . children ( '.' + tagClass ) . length && $selectedItemsWrap . children ( '.' + tagClass ) [ 0 ] . getAttribute ( tagIdAttribute ) != "~~id~~" ) { if ( $selectedItemsWrap . find ( '.' + tagButton Class ) . length && $selectedItemsWrap . find ( '.' + tagButton Class ) [ 0 ] . getAttribute ( tagIdAttribute ) != "~~id~~" ) {
$selectedItemsWrap . addClass ( 'visible' ) ; $selectedItemsWrap . addClass ( 'visible' ) ;
} else { } else {
$selectedItemsWrap . removeClass ( 'visible' ) ; $selectedItemsWrap . removeClass ( 'visible' ) ;
} }
} , } ,
createTagList = function ( sublist ) { createTagList = function ( sublist ) {
var $selected = $ ( DOMS ublist) . children ( 'li' ) . children ( '.' + fakeCheckboxClass ) . find ( '.' + checkboxClass + ':checked' ) ; var $selected = $ ( s ublist) . children ( 'li' ) . children ( '.' + fakeCheckboxClass ) . find ( '.' + checkboxClass + ':checked' ) ;
$selected . each ( function ( ) { $selected . each ( function ( ) {
createTag ( this ) ; createTag ( this ) ;
} ) ; } ) ;
} , } ,
deleteTagList = function ( ) { deleteTagList = function ( ) {
var $selected = $ ( DOMSublist ) . children ( 'li' ) . children ( '.' + fakeCheckboxClass ) . find ( '.' + checkboxClass + ':checked' ) ; var $selected = $ ( DOMSublist ) . children ( 'li' ) . children ( '.' + fakeCheckboxClass ) . find ( '.' + checkboxClass + ':checked' ) ;
$selected . each ( function ( ) { $selected . each ( function ( ) {
deleteTag ( this ) ; deleteTag ( this ) ;
} ) ; } ) ;
} ; } ;
//make fake checkbox active\passive
//make fake checkbox active\passive
if ( this . checked ) { / * *
* if modala is not in strict mode ( enable popping from children categories to parent )
* /
if ( ! self . strictMode ) {
//если выбраны все дочерние
if ( this . checked ) {
if ( allChildrenSelected ( ) ) { if ( $ ( DOMSublistInner ) . find ( '.' + checkboxClass ) [ 0 ] ) {
selectParent ( this ) ;
selectItem ( this ) ; if ( DOMSublistInner && $ ( DOMSublistInner ) . find ( '.' + checkboxClass ) [ 0 ] . value != '~~id~~' ) {
refreshTags ( DOMParentCheckbox ) ; refreshTags ( this ) ;
createTag ( DOMParentCheckbox ) ; }
deleteTagList ( DOMSublist ) ;
if ( DOMParentCheckbox . getAttribute ( 'id' ) == DOMHighestCheckbox . getAttribute ( 'id' ) && ! DOMHighestCheckbox . checked ) {
selectItem ( DOMHighestCheckbox ) ;
refreshTags ( DOMHighestCheckbox ) ;
createTag ( DOMHighestCheckbox ) ;
} }
} else { //если выбраны все дочерние
if ( allChildrenSelected ( ) ) {
selectParent ( this ) ;
selectItem ( this ) ;
refreshTags ( DOMParentCheckbox ) ;
createTag ( DOMParentCheckbox ) ;
deleteTagList ( DOMSublist ) ;
if ( DOMParentCheckbox . getAttribute ( 'id' ) == DOMHighestCheckbox . getAttribute ( 'id' ) && ! DOMHighestCheckbox . checked ) {
selectItem ( DOMHighestCheckbox ) ;
refreshTags ( DOMHighestCheckbox ) ;
createTag ( DOMHighestCheckbox ) ;
}
} else {
selectItem ( this ) ;
refreshTags ( this ) ;
createTag ( this ) ;
}
//выбрать все дочерние
if ( DOMSublistInner ) {
selectSublist ( this ) ;
}
} else {
//Если выбран родитель
if ( parentSelected ( ) ) {
unSelectParent ( this ) ;
unSelectItem ( this ) ;
refreshTags ( DOMParentCheckbox ) ;
deleteTag ( DOMParentCheckbox ) ;
createTagList ( DOMSublist ) ;
if ( DOMHighestCheckbox . checked ) {
unSelectItem ( DOMHighestCheckbox ) ;
deleteTag ( DOMHighestCheckbox ) ;
createTagList ( DOMHighestSublist ) ;
}
} else {
unSelectItem ( this ) ;
refreshTags ( this ) ;
deleteTag ( this ) ;
}
//убрать все дочерние
if ( DOMSublistInner ) {
unSelectSublist ( this ) ;
refreshTags ( this ) ;
}
}
} else {
if ( this . checked ) {
selectItem ( this ) ; selectItem ( this ) ;
refreshTags ( this ) ; refreshTags ( this ) ;
createTag ( this ) ; createTag ( this ) ;
} } else {
//выбрать все дочерние
if ( DOMSublistInner ) {
selectSublist ( this ) ;
}
} else {
//Если выбран родитель
if ( parentSelected ( ) ) {
unSelectParent ( this ) ;
unSelectItem ( this ) ;
refreshTags ( DOMParentCheckbox ) ;
deleteTag ( DOMParentCheckbox ) ;
createTagList ( DOMSublist ) ;
if ( DOMHighestCheckbox . checked ) {
unSelectItem ( DOMHighestCheckbox ) ;
refreshTags ( DOMHighestCheckbox ) ;
deleteTag ( DOMHighestCheckbox ) ;
}
} else {
unSelectItem ( this ) ; unSelectItem ( this ) ;
refreshTags ( this ) ; refreshTags ( this ) ;
deleteTag ( this ) ; deleteTag ( this ) ;
} }
//убрать все дочерние
if ( DOMSublistInner ) {
unSelectSublist ( this ) ;
}
} }
triggerSetText ( ) ; triggerSetText ( ) ;
} ) ; } ) ;
@ -1075,8 +1121,9 @@ if (EXPO.events.feed) {
} }
return false ; return false ;
} ) ; } ) ;
$ ( '#' + self . opt . deleteId ) . on ( 'click' , function ( ) { $ ( '.del-on-page' ) . on ( 'click' , function ( ) {
$ ( '.' + self . opt . deleteTagClass , $modal ) . trigger ( 'click' ) ; var dataCheckboxId = $ ( this ) . attr ( 'data-checkbox-id' ) ;
$ ( '.' + self . opt . deleteTagClass + '[data-checkbox-id="' + dataCheckboxId + '"]' , $modal ) . trigger ( 'click' ) ;
} ) ; } ) ;
/ * * / * *
* clear all button behavior * clear all button behavior
@ -1106,10 +1153,13 @@ if (EXPO.events.feed) {
self . applyHandler ( this ) ; self . applyHandler ( this ) ;
return false ; return false ;
} ) ; } ) ;
$modalTrigger . siblings ( '.' + self . opt . clearAllButtonClass ) . on ( 'click' , function ( ) { $ ( '.' + self . opt . clearAllButtonClass , $modal ) . on ( 'click' , function ( e ) {
e . preventDefault ( ) ;
self . resetList ( ) ; self . resetList ( ) ;
return false ;
} ) ; } ) ;
} ) ; } ) ;
@ -1367,14 +1417,15 @@ if (EXPO.events.feed) {
var self = this ; var self = this ;
for ( var key in self . itemsSelected ) { for ( var key in self . itemsSelected ) {
if ( self . itemsSelected . hasOwnProperty ( key ) ) { if ( self . itemsSelected . hasOwnProperty ( key ) ) {
$ ( '#' + key , self . $selfContainer ) . prop ( 'checked' , false ) . trigger ( 'chang e') ; $ ( '#' + key , self . $selfContainer ) . prop ( 'checked' , false ) . closest ( '.custom-radio-check' ) . removeClass ( 'activ e') ;
dna . destroy ( self . itemsSelected [ key ] ) ; dna . destroy ( self . itemsSelected [ key ] ) ;
dna . destroy ( self . tagsBoxItems [ key ] ) ;
} }
} }
$ ( '.sublist:not(.parent)' , self . $modal ) . addClass ( 'hidden ') ; $ ( '.level.active' , this . $modal ) . removeClass ( 'active ') ;
$ ( '.level' , self . $modal ) . removeClass ( 'active' ) ; this . _refreshLabel ( ) ;
self . selectedWrap . removeClass ( 'visible' ) ; this . selectedWrap . removeClass ( 'visible' ) ;
} , } ,
/ * * / * *
* initiliazing and setup autocomplete field for places list * initiliazing and setup autocomplete field for places list
@ -1575,6 +1626,7 @@ if (EXPO.events.feed) {
} , } ,
applyHandler : function ( it ) { applyHandler : function ( it ) {
EXPO . events . feed . modalWindow . close ( ) ;
} , } ,
/ * * / * *
* render label text , if there is no selected element then text will be default * render label text , if there is no selected element then text will be default
@ -1641,14 +1693,6 @@ if (EXPO.events.feed) {
this . placesModal = new PlacesModal ( self . opt . place ) ; this . placesModal = new PlacesModal ( self . opt . place ) ;
this . subjModal = new SubjectModal ( self . opt . subject ) ; this . subjModal = new SubjectModal ( self . opt . subject ) ;
this . placesModal . applyHandler = function ( ) {
self . modalWindow . close ( ) ;
$ ( self . DOMform ) . submit ( ) ;
} ;
this . subjModal . applyHandler = function ( ) {
self . modalWindow . close ( ) ;
$ ( self . DOMform ) . submit ( ) ;
} ;
// заполнение полей предыдущими значениями
// заполнение полей предыдущими значениями
$ ( function ( ) { $ ( function ( ) {
if ( self . previousSearch . inputs . length ) { if ( self . previousSearch . inputs . length ) {
Назар Котюк
11 years ago