EXPO-33 ready

remotes/origin/1203
pavel 11 years ago
parent fd61c1cefe
commit 449a1a94a0
  1. 25
      templates/client/static_client/css/main.css
  2. 30
      templates/client/static_client/js/_modules/block.search.js
  3. 2
      templates/client/static_client/js_min/_modules/block.search.min.js

@ -2158,9 +2158,6 @@ button.icon-save:before {
-moz-box-sizing: border-box;
box-sizing: border-box;
}
/*ul.ui-autocomplete.ui-menu {*/
/*z-index: 10000;*/
/*}*/
.ui-autocomplete-category {
font-size: 15px;
line-height: 17px;
@ -2197,6 +2194,7 @@ button.icon-save:before {
.mp-catalog {
}
/* end of search block*/
.main-page .page-wrap .mp-catalog .layout-wrap {
@ -12266,6 +12264,27 @@ hr + .rq-note {
border-width: 2px;
border-color: #D80000;
}
.in-search-form .ui-menu .ui-menu-item .subj-category{
display: inline-block;
color: #a2a2a2;
font-size: 15px;
line-height: 15px;
border: none;
padding: 2px 5px;
cursor: pointer;
text-decoration: none;
min-height: 0;
font-weight: 400;
}
.in-search-form .ui-menu .ui-menu-item a{
display: inline-block;
}
.in-search-form .ui-menu li{
margin-bottom: 4px;
}
.in-search-form .ui-menu{
line-height: 15px;
}
/******************************\
# form validation

@ -549,7 +549,7 @@ if (EXPO.searchBlock){
}
if(!self.$inputFilter.hasClass('ui-autocomplete-input')){
self.$inputFilter.autocomplete({
self.$inputFilter.placeComplete({
source:dataObj,
minLength: 0,
appendTo:$completeWrap,
@ -561,11 +561,11 @@ if (EXPO.searchBlock){
// return ui.label;
}
});
self.$inputFilter.autocomplete('search',"");
self.$inputFilter.placeComplete('search',"");
firstComplete = false;
}else{
self.$inputFilter.autocomplete('search',"");
self.$inputFilter.placeComplete('search',"");
}
};
@ -583,7 +583,7 @@ if (EXPO.searchBlock){
}else if(text.length == 0 && !firstComplete){
if(self.$inputFilter.hasClass('ui-autocomplete-input')){
self.$inputFilter.autocomplete( "destroy" );
self.$inputFilter.placeComplete( "destroy" );
firstComplete = true;
}
}
@ -593,7 +593,6 @@ if (EXPO.searchBlock){
});
},
//
/**
* render first level sublist
* @param {Object} dataObj
@ -2042,6 +2041,27 @@ if (EXPO.searchBlock){
});
}
});
$.widget( "custom.exibitionComplete", $.ui.autocomplete,{
_renderMenu: function( ul, items ) {
var that = this,
currentCategory = "";
$.each( items, function( index, item ) {
if ( item.cat != currentCategory && item.cat) {
ul.append( "<li class='ui-autocomplete-category'>" + item.cat + "</li>" );
currentCategory = item.cat;
}
that._renderItemData( ul, item );
});
}
});
$.widget( "custom.placeComplete", $.ui.autocomplete,{
_renderItem: function( ul, item ) {
return $( "<li>" )
.append( $( "<a>" ).text( item.label) )
.append('<span class="subj-category"> ('+item.cat+')</span>')
.appendTo( ul );
}
});
this.exhibitionField = new MainField(self.settings.firstField);
this.exhibitionField.completeName = 'exibitionComplete';

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