From b332b9fd3ff16c0b184e19c4f010fa82ff234840 Mon Sep 17 00:00:00 2001 From: Geoffry Song Date: Tue, 25 Mar 2014 10:38:15 -0400 Subject: [PATCH 1/2] Don't show the placeholder when there's entered text. Otherwise the text overlaps with the placeholder. --- build-min/visualsearch.js | 4 ++-- build-min/visualsearch.js.gz | Bin 8410 -> 8437 bytes build/visualsearch.js | 3 ++- lib/js/views/search_box.js | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build-min/visualsearch.js b/build-min/visualsearch.js index 33bd88c..8a95f17 100644 --- a/build-min/visualsearch.js +++ b/build-min/visualsearch.js @@ -1,11 +1,11 @@ (function(){var $=jQuery;if(!window.VS)window.VS={};if(!VS.app)VS.app={};if(!VS.ui)VS.ui={};if(!VS.model)VS.model={};if(!VS.utils)VS.utils={};VS.VERSION='0.5.0';VS.VisualSearch=function(options){var defaults={container:'',query:'',autosearch:true,unquotable:[],remainder:'text',showFacets:true,readOnly:false,callbacks:{search:$.noop,focus:$.noop,blur:$.noop,facetMatches:$.noop,valueMatches:$.noop,clearSearch:$.noop,removedFacet:$.noop}};this.options=_.extend({},defaults,options);this.options.callbacks=_.extend({},defaults.callbacks,options.callbacks);VS.app.hotkeys.initialize();this.searchQuery=new VS.model.SearchQuery();this.searchBox=new VS.ui.SearchBox({app:this,showFacets:this.options.showFacets});if(options.container){var searchBox=this.searchBox.render().el;$(this.options.container).html(searchBox);} this.searchBox.value(this.options.query||'');$(window).bind('unload',function(e){});return this;};VS.init=function(options){return new VS.VisualSearch(options);};})();(function(){var $=jQuery;VS.ui.SearchBox=Backbone.View.extend({id:'search',events:{'click .VS-cancel-search-box':'clearSearch','mousedown .VS-search-box':'maybeFocusSearch','dblclick .VS-search-box':'highlightSearch','click .VS-search-box':'maybeTripleClick'},initialize:function(options){this.options=_.extend({},this.options,options);this.app=this.options.app;this.flags={allSelected:false};this.facetViews=[];this.inputViews=[];_.bindAll(this,'renderFacets','_maybeDisableFacets','disableFacets','deselectAllFacets','addedFacet','removedFacet','changedFacet');this.app.searchQuery.bind('reset',this.renderFacets).bind('add',this.addedFacet).bind('remove',this.removedFacet).bind('change',this.changedFacet);$(document).bind('keydown',this._maybeDisableFacets);},render:function(){$(this.el).append(JST['search_box']({readOnly:this.app.options.readOnly}));$(document.body).setMode('no','search');return this;},value:function(query){if(query==null)return this.serialize();return this.setQuery(query);},serialize:function(){var query=[];var inputViewsCount=this.inputViews.length;this.app.searchQuery.each(_.bind(function(facet,i){query.push(this.inputViews[i].value());query.push(facet.serialize());},this));if(inputViewsCount){query.push(this.inputViews[inputViewsCount-1].value());} -return _.compact(query).join(' ');},selected:function(){return _.select(this.facetViews,function(view){return view.modes.editing=='is'||view.modes.selected=='is';});},selectedModels:function(){return _.pluck(this.selected(),'model');},setQuery:function(query){this.currentQuery=query;VS.app.SearchParser.parse(this.app,query);},viewPosition:function(view){var views=view.type=='facet'?this.facetViews:this.inputViews;var position=_.indexOf(views,view);if(position==-1)position=0;return position;},searchEvent:function(e){var query=this.value();this.focusSearch(e);this.value(query);this.app.options.callbacks.search(query,this.app.searchQuery);},addFacet:function(category,initialQuery,position){category=VS.utils.inflector.trim(category);initialQuery=VS.utils.inflector.trim(initialQuery||'');if(!category)return;var model=new VS.model.SearchFacet({category:category,value:initialQuery||'',app:this.app});this.app.searchQuery.add(model,{at:position});},addedFacet:function(model){this.renderFacets();var facetView=_.detect(this.facetViews,function(view){if(view.model==model)return true;});_.defer(function(){facetView.enableEdit();});},changedFacet:function(){this.renderFacets();},removedFacet:function(facet,query,options){this.app.options.callbacks.removedFacet(facet,query,options);},renderFacets:function(){this.facetViews=[];this.inputViews=[];this.$('.VS-search-inner').empty();this.app.searchQuery.each(_.bind(this.renderFacet,this));this.renderSearchInput();this.renderPlaceholder();},renderFacet:function(facet,position){var view=new VS.ui.SearchFacet({app:this.app,model:facet,order:position});this.renderSearchInput();this.facetViews.push(view);this.$('.VS-search-inner').children().eq(position*2).after(view.render().el);view.calculateSize();_.defer(_.bind(view.calculateSize,view));return view;},renderSearchInput:function(){var input=new VS.ui.SearchInput({position:this.inputViews.length,app:this.app,showFacets:this.options.showFacets});this.$('.VS-search-inner').append(input.render().el);this.inputViews.push(input);},renderPlaceholder:function(){var $placeholder=this.$('.VS-placeholder');if(this.app.searchQuery.length){$placeholder.addClass("VS-hidden");}else{$placeholder.removeClass("VS-hidden").text(this.app.options.placeholder);}},clearSearch:function(e){if(this.app.options.readOnly)return;var actualClearSearch=_.bind(function(){this.disableFacets();this.value('');this.flags.allSelected=false;this.searchEvent(e);this.focusSearch(e);},this);if(this.app.options.callbacks.clearSearch!=$.noop){this.app.options.callbacks.clearSearch(actualClearSearch);}else{actualClearSearch();}},selectAllFacets:function(){this.flags.allSelected=true;$(document).one('click.selectAllFacets',this.deselectAllFacets);_.each(this.facetViews,function(facetView,i){facetView.selectFacet();});_.each(this.inputViews,function(inputView,i){inputView.selectText();});},allSelected:function(deselect){if(deselect)this.flags.allSelected=false;return this.flags.allSelected;},deselectAllFacets:function(e){this.disableFacets();if(this.$(e.target).is('.category,input')){var el=$(e.target).closest('.search_facet,.search_input');var view=_.detect(this.facetViews.concat(this.inputViews),function(v){return v.el==el[0];});if(view.type=='facet'){view.selectFacet();}else if(view.type=='input'){_.defer(function(){view.enableEdit(true);});}}},disableFacets:function(keepView){_.each(this.inputViews,function(view){if(view&&view!=keepView&&(view.modes.editing=='is'||view.modes.selected=='is')){view.disableEdit();}});_.each(this.facetViews,function(view){if(view&&view!=keepView&&(view.modes.editing=='is'||view.modes.selected=='is')){view.disableEdit();view.deselectFacet();}});this.flags.allSelected=false;this.removeFocus();$(document).unbind('click.selectAllFacets');},resizeFacets:function(view){_.each(this.facetViews,function(facetView,i){if(!view||facetView==view){facetView.resize();}});},_maybeDisableFacets:function(e){if(this.flags.allSelected&&VS.app.hotkeys.key(e)=='backspace'){e.preventDefault();this.clearSearch(e);return false;}else if(this.flags.allSelected&&VS.app.hotkeys.printable(e)){this.clearSearch(e);}},focusNextFacet:function(currentView,direction,options){options=options||{};var viewCount=this.facetViews.length;var viewPosition=options.viewPosition||this.viewPosition(currentView);if(!options.skipToFacet){if(currentView.type=='text'&&direction>0)direction-=1;if(currentView.type=='facet'&&direction<0)direction+=1;}else if(options.skipToFacet&¤tView.type=='text'&&viewCount==viewPosition&&direction>=0){return false;} +return _.compact(query).join(' ');},selected:function(){return _.select(this.facetViews,function(view){return view.modes.editing=='is'||view.modes.selected=='is';});},selectedModels:function(){return _.pluck(this.selected(),'model');},setQuery:function(query){this.currentQuery=query;VS.app.SearchParser.parse(this.app,query);},viewPosition:function(view){var views=view.type=='facet'?this.facetViews:this.inputViews;var position=_.indexOf(views,view);if(position==-1)position=0;return position;},searchEvent:function(e){var query=this.value();this.focusSearch(e);this.value(query);this.app.options.callbacks.search(query,this.app.searchQuery);},addFacet:function(category,initialQuery,position){category=VS.utils.inflector.trim(category);initialQuery=VS.utils.inflector.trim(initialQuery||'');if(!category)return;var model=new VS.model.SearchFacet({category:category,value:initialQuery||'',app:this.app});this.app.searchQuery.add(model,{at:position});},addedFacet:function(model){this.renderFacets();var facetView=_.detect(this.facetViews,function(view){if(view.model==model)return true;});_.defer(function(){facetView.enableEdit();});},changedFacet:function(){this.renderFacets();},removedFacet:function(facet,query,options){this.app.options.callbacks.removedFacet(facet,query,options);},renderFacets:function(){this.facetViews=[];this.inputViews=[];this.$('.VS-search-inner').empty();this.app.searchQuery.each(_.bind(this.renderFacet,this));this.renderSearchInput();this.renderPlaceholder();},renderFacet:function(facet,position){var view=new VS.ui.SearchFacet({app:this.app,model:facet,order:position});this.renderSearchInput();this.facetViews.push(view);this.$('.VS-search-inner').children().eq(position*2).after(view.render().el);view.calculateSize();_.defer(_.bind(view.calculateSize,view));return view;},renderSearchInput:function(){var input=new VS.ui.SearchInput({position:this.inputViews.length,app:this.app,showFacets:this.options.showFacets});this.$('.VS-search-inner').append(input.render().el);this.inputViews.push(input);},renderPlaceholder:function(){var $placeholder=this.$('.VS-placeholder');if(this.app.searchQuery.length||_.any(this.inputViews,function(view){return view.value()!="";})){$placeholder.addClass("VS-hidden");}else{$placeholder.removeClass("VS-hidden").text(this.app.options.placeholder);}},clearSearch:function(e){if(this.app.options.readOnly)return;var actualClearSearch=_.bind(function(){this.disableFacets();this.value('');this.flags.allSelected=false;this.searchEvent(e);this.focusSearch(e);},this);if(this.app.options.callbacks.clearSearch!=$.noop){this.app.options.callbacks.clearSearch(actualClearSearch);}else{actualClearSearch();}},selectAllFacets:function(){this.flags.allSelected=true;$(document).one('click.selectAllFacets',this.deselectAllFacets);_.each(this.facetViews,function(facetView,i){facetView.selectFacet();});_.each(this.inputViews,function(inputView,i){inputView.selectText();});},allSelected:function(deselect){if(deselect)this.flags.allSelected=false;return this.flags.allSelected;},deselectAllFacets:function(e){this.disableFacets();if(this.$(e.target).is('.category,input')){var el=$(e.target).closest('.search_facet,.search_input');var view=_.detect(this.facetViews.concat(this.inputViews),function(v){return v.el==el[0];});if(view.type=='facet'){view.selectFacet();}else if(view.type=='input'){_.defer(function(){view.enableEdit(true);});}}},disableFacets:function(keepView){_.each(this.inputViews,function(view){if(view&&view!=keepView&&(view.modes.editing=='is'||view.modes.selected=='is')){view.disableEdit();}});_.each(this.facetViews,function(view){if(view&&view!=keepView&&(view.modes.editing=='is'||view.modes.selected=='is')){view.disableEdit();view.deselectFacet();}});this.flags.allSelected=false;this.removeFocus();$(document).unbind('click.selectAllFacets');},resizeFacets:function(view){_.each(this.facetViews,function(facetView,i){if(!view||facetView==view){facetView.resize();}});},_maybeDisableFacets:function(e){if(this.flags.allSelected&&VS.app.hotkeys.key(e)=='backspace'){e.preventDefault();this.clearSearch(e);return false;}else if(this.flags.allSelected&&VS.app.hotkeys.printable(e)){this.clearSearch(e);}},focusNextFacet:function(currentView,direction,options){options=options||{};var viewCount=this.facetViews.length;var viewPosition=options.viewPosition||this.viewPosition(currentView);if(!options.skipToFacet){if(currentView.type=='text'&&direction>0)direction-=1;if(currentView.type=='facet'&&direction<0)direction+=1;}else if(options.skipToFacet&¤tView.type=='text'&&viewCount==viewPosition&&direction>=0){return false;} var view,next=Math.min(viewCount,viewPosition+direction);if(currentView.type=='text'){if(next>=0&&next=viewCount||next<0){view=_.last(this.inputViews);view.enableEdit();}else{view=this.facetViews[next];view.enableEdit();view.setCursorAtEnd(direction||options.startAtEnd);}}else{view=this.inputViews[next];view.enableEdit();}} if(options.selectText)view.selectText();this.resizeFacets();return true;},maybeFocusSearch:function(e){if(this.app.options.readOnly)return;if($(e.target).is('.VS-search-box')||$(e.target).is('.VS-search-inner')||e.type=='keydown'){this.focusSearch(e);}},focusSearch:function(e,selectText){if(this.app.options.readOnly)return;var view=this.inputViews[this.inputViews.length-1];view.enableEdit(selectText);if(!selectText)view.setCursorAtEnd(-1);if(e.type=='keydown'){view.keydown(e);view.box.trigger('keydown');} -_.defer(_.bind(function(){if(!this.$('input:focus').length){view.enableEdit(selectText);}},this));},highlightSearch:function(e){if(this.app.options.readOnly)return;if($(e.target).is('.VS-search-box')||$(e.target).is('.VS-search-inner')||e.type=='keydown'){var lastinput=this.inputViews[this.inputViews.length-1];lastinput.startTripleClickTimer();this.focusSearch(e,true);}},maybeTripleClick:function(e){var lastinput=this.inputViews[this.inputViews.length-1];return lastinput.maybeTripleClick(e);},addFocus:function(){if(this.app.options.readOnly)return;this.app.options.callbacks.focus();this.$('.VS-search-box').addClass('VS-focus');},removeFocus:function(){this.app.options.callbacks.blur();var focus=_.any(this.facetViews.concat(this.inputViews),function(view){return view.isFocused();});if(!focus)this.$('.VS-search-box').removeClass('VS-focus');},showFacetCategoryMenu:function(e){e.preventDefault();e.stopPropagation();if(this.facetCategoryMenu&&this.facetCategoryMenu.modes.open=='is'){return this.facetCategoryMenu.close();} +_.defer(_.bind(function(){if(!this.$('input:focus').length){view.enableEdit(selectText);}},this));},highlightSearch:function(e){if(this.app.options.readOnly)return;if($(e.target).is('.VS-search-box')||$(e.target).is('.VS-search-inner')||e.type=='keydown'){var lastinput=this.inputViews[this.inputViews.length-1];lastinput.startTripleClickTimer();this.focusSearch(e,true);}},maybeTripleClick:function(e){var lastinput=this.inputViews[this.inputViews.length-1];return lastinput.maybeTripleClick(e);},addFocus:function(){if(this.app.options.readOnly)return;this.app.options.callbacks.focus();this.$('.VS-search-box').addClass('VS-focus');},removeFocus:function(){this.app.options.callbacks.blur();var focus=_.any(this.facetViews.concat(this.inputViews),function(view){return view.isFocused();});if(!focus)this.$('.VS-search-box').removeClass('VS-focus');this.renderPlaceholder();},showFacetCategoryMenu:function(e){e.preventDefault();e.stopPropagation();if(this.facetCategoryMenu&&this.facetCategoryMenu.modes.open=='is'){return this.facetCategoryMenu.close();} var items=[{title:'Account',onClick:_.bind(this.addFacet,this,'account','')},{title:'Project',onClick:_.bind(this.addFacet,this,'project','')},{title:'Filter',onClick:_.bind(this.addFacet,this,'filter','')},{title:'Access',onClick:_.bind(this.addFacet,this,'access','')}];var menu=this.facetCategoryMenu||(this.facetCategoryMenu=new dc.ui.Menu({items:items,standalone:true}));this.$('.VS-icon-search').after(menu.render().open().content);return false;}});})();(function(){var $=jQuery;VS.ui.SearchFacet=Backbone.View.extend({type:'facet',className:'search_facet',events:{'click .category':'selectFacet','keydown input':'keydown','mousedown input':'enableEdit','mouseover .VS-icon-cancel':'showDelete','mouseout .VS-icon-cancel':'hideDelete','click .VS-icon-cancel':'remove'},initialize:function(options){this.options=_.extend({},this.options,options);this.flags={canClose:false};_.bindAll(this,'set','keydown','deselectFacet','deferDisableEdit');this.app=this.options.app;},render:function(){$(this.el).html(JST['search_facet']({model:this.model,readOnly:this.app.options.readOnly}));this.setMode('not','editing');this.setMode('not','selected');this.box=this.$('input');this.box.val(this.model.label());this.box.bind('blur',this.deferDisableEdit);this.box.bind('input propertychange',this.keydown);this.setupAutocomplete();return this;},calculateSize:function(){this.box.autoGrowInput();this.box.unbind('updated.autogrow');this.box.bind('updated.autogrow',_.bind(this.moveAutocomplete,this));},resize:function(e){this.box.trigger('resize.autogrow',e);},setupAutocomplete:function(){this.box.autocomplete({source:_.bind(this.autocompleteValues,this),minLength:0,delay:0,autoFocus:true,position:{offset:"0 5"},create:_.bind(function(e,ui){$(this.el).find('.ui-autocomplete-input').css('z-index','auto');},this),select:_.bind(function(e,ui){e.preventDefault();var originalValue=this.model.get('value');this.set(ui.item.value);if(originalValue!=ui.item.value||this.box.val()!=ui.item.value){if(this.app.options.autosearch){this.search(e);}else{this.app.searchBox.renderFacets();this.app.searchBox.focusNextFacet(this,1,{viewPosition:this.options.order});}} return false;},this),open:_.bind(function(e,ui){var box=this.box;this.box.autocomplete('widget').find('.ui-menu-item').each(function(){var $value=$(this),autoCompleteData=$value.data('item.autocomplete')||$value.data('ui-autocomplete-item');if(autoCompleteData['value']==box.val()&&box.data('ui-autocomplete').menu.activate){box.data('ui-autocomplete').menu.activate(new $.Event("mouseover"),$value);}});},this)});this.box.autocomplete('widget').addClass('VS-interface');},moveAutocomplete:function(){var autocomplete=this.box.data('ui-autocomplete');if(autocomplete){autocomplete.menu.element.position({my:"left top",at:"left bottom",of:this.box.data('ui-autocomplete').element,collision:"flip",offset:"0 5"});}},searchAutocomplete:function(e){var autocomplete=this.box.data('ui-autocomplete');if(autocomplete){var menu=autocomplete.menu.element;autocomplete.search();menu.outerWidth(Math.max(menu.width('').outerWidth(),autocomplete.element.outerWidth()));}},closeAutocomplete:function(){var autocomplete=this.box.data('ui-autocomplete');if(autocomplete)autocomplete.close();},autocompleteValues:function(req,resp){var category=this.model.get('category');var value=this.model.get('value');var searchTerm=req.term;this.app.options.callbacks.valueMatches(category,searchTerm,function(matches,options){options=options||{};matches=matches||[];if(searchTerm&&value!=searchTerm){if(options.preserveMatches){resp(matches);}else{var re=VS.utils.inflector.escapeRegExp(searchTerm||'');var matcher=new RegExp('\\b'+re,'i');matches=$.grep(matches,function(item){return matcher.test(item)||matcher.test(item.value)||matcher.test(item.label);});}} if(options.preserveOrder){resp(matches);}else{resp(_.sortBy(matches,function(match){if(match==value||match.value==value)return'';else return match;}));}});},set:function(value){if(!value)return;this.model.set({'value':value});},search:function(e,direction){if(!direction)direction=1;this.closeAutocomplete();this.app.searchBox.searchEvent(e);_.defer(_.bind(function(){this.app.searchBox.focusNextFacet(this,direction,{viewPosition:this.options.order});},this));},enableEdit:function(){if(this.app.options.readOnly)return;if(this.modes.editing!='is'){this.setMode('is','editing');this.deselectFacet();if(this.box.val()==''){this.box.val(this.model.get('value'));}} diff --git a/build-min/visualsearch.js.gz b/build-min/visualsearch.js.gz index 8b0339a4ada673d92c6e1702d8f4851ad85fa866..34bb68c8146c477a04aecca06c218d74ea0e56ec 100644 GIT binary patch literal 8437 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 X>x{+p?lX}+J0sEsBF4KVi)r#iDG|2+-Lx-)? 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 diff --git a/build/visualsearch.js b/build/visualsearch.js index 6d03e18..8d51a5f 100644 --- a/build/visualsearch.js +++ b/build/visualsearch.js @@ -278,7 +278,7 @@ VS.ui.SearchBox = Backbone.View.extend({ // Handles showing/hiding the placeholder text renderPlaceholder : function() { var $placeholder = this.$('.VS-placeholder'); - if (this.app.searchQuery.length) { + if (this.app.searchQuery.length || _.any(this.inputViews, function(view) { return view.value() != ""; })) { $placeholder.addClass("VS-hidden"); } else { $placeholder.removeClass("VS-hidden") @@ -508,6 +508,7 @@ VS.ui.SearchBox = Backbone.View.extend({ return view.isFocused(); }); if (!focus) this.$('.VS-search-box').removeClass('VS-focus'); + this.renderPlaceholder(); }, // Show a menu which adds pre-defined facets to the search box. This is unused for now. diff --git a/lib/js/views/search_box.js b/lib/js/views/search_box.js index 2af7213..8d0f7ba 100644 --- a/lib/js/views/search_box.js +++ b/lib/js/views/search_box.js @@ -197,7 +197,7 @@ VS.ui.SearchBox = Backbone.View.extend({ // Handles showing/hiding the placeholder text renderPlaceholder : function() { var $placeholder = this.$('.VS-placeholder'); - if (this.app.searchQuery.length) { + if (this.app.searchQuery.length || _.any(this.inputViews, function(view) { return view.value() != ""; })) { $placeholder.addClass("VS-hidden"); } else { $placeholder.removeClass("VS-hidden") @@ -427,6 +427,7 @@ VS.ui.SearchBox = Backbone.View.extend({ return view.isFocused(); }); if (!focus) this.$('.VS-search-box').removeClass('VS-focus'); + this.renderPlaceholder(); }, // Show a menu which adds pre-defined facets to the search box. This is unused for now. From a7f50f4bfd02800e71f5480a1b25f23ec14911d5 Mon Sep 17 00:00:00 2001 From: Dan Le Date: Thu, 25 Sep 2014 16:59:27 -0400 Subject: [PATCH 2/2] Hide cancel(clear) button when search box empty --- build-min/visualsearch-datauri.css | 2 +- build-min/visualsearch-datauri.css.gz | Bin 2750 -> 2759 bytes build-min/visualsearch.css | 2 +- build-min/visualsearch.css.gz | Bin 1741 -> 1763 bytes build-min/visualsearch.js | 6 +++--- build-min/visualsearch.js.gz | Bin 8437 -> 8497 bytes build-min/visualsearch_templates.js | 2 +- build-min/visualsearch_templates.js.gz | Bin 368 -> 374 bytes build/visualsearch-datauri.css | 3 ++- build/visualsearch.css | 7 ++++--- build/visualsearch.js | 17 +++++++++++++++-- lib/css/workspace.css | 3 ++- lib/js/templates/search_box.jst | 4 ++-- lib/js/templates/templates.js | 2 +- lib/js/views/search_box.js | 15 ++++++++++++++- 15 files changed, 46 insertions(+), 17 deletions(-) diff --git a/build-min/visualsearch-datauri.css b/build-min/visualsearch-datauri.css index 51f2a32..10fd65b 100644 --- a/build-min/visualsearch-datauri.css +++ b/build-min/visualsearch-datauri.css @@ -1 +1 @@ -.VS-search .VS-icon{background-repeat:no-repeat;background-position:center center;vertical-align:middle;width:16px;height:16px}.VS-search .VS-icon-cancel{width:11px;height:11px;background-position:center 0;background-image:url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAWCAYAAAAW5GZjAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAb9JREFUeNqUUr1qAkEQ3j0khQp6kihaeGgEEa18gTQR0iRY+BaBSMDGwidIEUKqFL6BopgqBAJ5AMFGjUU0d4WHEvwJarvZ77gRIzGYgb1hZr+Z75vZ40IIzqTNZrPj8Xicn0wmmcViEXS73aaqqq+BQODG6/W+A8MBNk3zfDAY3C6Xy0O2ZS6X6zMSiVwHg8FHLjtq7Xb7RQKj7BeTzVCgJ5PJU2U0GhUk7REuMpkMi8fjFggeMeecrVYrFRId0CgTAgDDMFg4HLbA8IjJgHNgGEr0er0fQIphUmZAwdSUADUB4RFDsz3oSMF6CLzZkQqgGebz+Z75dDqNdTqdp13bgDmdTj2VSp0oWHg0Gr2UNH2Z/9o+yMv7K4/HY/C/XhDUfr//jl7QQVT9fp/V63VWqVRYt9tliUSCZbPZg1wux9Lp9PqFeK1Wu9A0DdXz7YM87i0FrVZLs4Fi1wmFQh/NZjOmVKvVgq7rR/QflMtlixGedjwcDlUpMQ9tbzalkAAB2/R297mNW+sT2wUbUnA//V/nYrH4QOBNABUQuFQq3TNMuc82sDVrz41G42yvPeODAwZQ0QzwiJEnzLcAAwBJ6WXlwoBgZAAAAABJRU5ErkJggg==");cursor:pointer}.VS-search .VS-icon-cancel:hover{background-position:center -11px}.VS-search .VS-icon-search{width:12px;height:12px;background-image:url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAUZJREFUeNpUUM2qgmAQzS8NiUgLzTIXLZQW1QuI9AY9QPSW9gQ9QiriwpJQEBVrVWT2d7p2L9xZzDdzZs7M+YYqy/J8Ptu2vd/v4zgeDAaqqk4mE47jar9GnU6nzWbjOA5FUa/Xq0Jns9l8Pud5vkpp58cwAOzhcBhFkeu6GNztdg3D+Db5vo9nOp2iiWGYTqdDCMFe4LquI0aVpGmKR9M0lmUbjQY8YiBJklTb4YkoilBzOBzq9TogeMQIJEmqmlAlo9EIyXa7tSyrKAp4xEBkWUb5q2k8Hh+PR8/zwjCEgufz+aESstvtoKnVan2GgY31kBkEAfT1ej1FUZDiNIIgrFYr9H1ug3teLpfH43G/3/FBUJGu1+s8z8FZLpc0mmiabrfbf5fEumazuVgsTNO8Xq+3242qRNT+G0CMz7IMzH6//xZgAA60tj6rqzxpAAAAAElFTkSuQmCC")}.VS-search div,.VS-search span,.VS-search a,.VS-search img,.VS-search ul,.VS-search li,.VS-search form,.VS-search label,.VS-interface ul,.VS-interface li,.VS-interface{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline}.VS-search :focus{outline:0}.VS-search{line-height:1;color:black}.VS-search ol,.VS-search ul{list-style:none}.VS-search{font-family:Arial,sans-serif;color:#373737;font-size:12px}.VS-search input{display:block;border:none;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;outline:none;margin:0;padding:4px;background:transparent;font-size:16px;line-height:20px;width:100%}.VS-interface,.VS-search .dialog,.VS-search input{font-family:"Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,sans-serif!important;line-height:1.1em}.VS-search .VS-search-box{cursor:text;position:relative;background:transparent;border:2px solid #ccc;border-radius:16px;-webkit-border-radius:16px;-moz-border-radius:16px;background-color:#fafafa;-webkit-box-shadow:inset 0 0 3px #ccc;-moz-box-shadow:inset 0 0 3px #ccc;box-shadow:inset 0 0 3px #ccc;min-height:28px;height:auto}.VS-search.VS-readonly .VS-search-box{cursor:default}.VS-search .VS-search-box.VS-focus{border-color:#acf;-webkit-box-shadow:inset 0 0 3px #acf;-moz-box-shadow:inset 0 0 3px #acf;box-shadow:inset 0 0 3px #acf}.VS-search .VS-placeholder{position:absolute;top:7px;left:4px;margin:0 20px 0 22px;color:#808080;font-size:14px}.VS-search .VS-search-box.VS-focus .VS-placeholder,.VS-search .VS-search-box .VS-placeholder.VS-hidden{display:none}.VS-search .VS-search-inner{position:relative;margin:0 20px 0 22px;overflow:hidden}.VS-search input{width:100px}.VS-search input,.VS-search .VS-input-width-tester{padding:6px 0;float:left;color:#808080;font:13px/17px Helvetica,Arial}.VS-search.VS-focus input{color:#606060}.VS-search .VS-icon-search{position:absolute;left:9px;top:8px}.VS-search .VS-icon-cancel{position:absolute;right:9px;top:8px}.VS-search.VS-readonly .VS-icon-cancel{display:none}.VS-search .search_facet{float:left;margin:0;padding:0 0 0 14px;position:relative;border:1px solid transparent;height:20px;margin:3px -3px 3px 0}.VS-search.VS-readonly .search_facet{padding-left:0}.VS-search .search_facet.is_selected{margin-left:-3px;-webkit-border-radius:16px;-moz-border-radius:16px;border-radius:16px;background-color:#d2e6fd;background-image:-moz-linear-gradient(top,#d2e6fd,#b0d1f9);background-image:-webkit-gradient(linear,left top,left bottom,from(#d2e6fd),to(#b0d1f9));background-image:linear-gradient(top,#d2e6fd,#b0d1f9);border:1px solid #6eadf5}.VS-search .search_facet .category{float:left;text-transform:uppercase;font-weight:bold;font-size:10px;color:#808080;padding:8px 0 5px;line-height:13px;cursor:pointer;padding:4px 0 0}.VS-search.VS-readonly .search_facet .category{cursor:default}.VS-search .search_facet.is_selected .category{margin-left:3px}.VS-search .search_facet .search_facet_input_container{float:left}.VS-search .search_facet input{margin:0;padding:0;color:#000;font-size:13px;line-height:16px;padding:5px 0 5px 4px;height:16px;width:auto;z-index:100;position:relative;padding-top:1px;padding-bottom:2px;padding-right:3px}.VS-search .search_facet.is_editing input,.VS-search .search_facet.is_selected input{color:#000}.VS-search.VS-readonly .search_facet .search_facet_remove{display:none}.VS-search .search_facet .search_facet_remove{position:absolute;left:0;top:4px}.VS-search .search_facet.is_selected .search_facet_remove{opacity:.4;left:3px;filter:alpha(opacity=40);background-position:center -11px}.VS-search .search_facet .search_facet_remove:hover{opacity:1}.VS-search .search_facet.is_editing .category,.VS-search .search_facet.is_selected .category{color:#000}.VS-search .search_facet.search_facet_maybe_delete .category,.VS-search .search_facet.search_facet_maybe_delete input{color:darkred}.VS-search .search_input{height:28px;float:left;margin-left:-1px}.VS-search .search_input input{padding:6px 3px 6px 2px;line-height:10px;height:22px;margin-top:-4px;width:10px;z-index:100;min-width:4px;position:relative}.VS-search .search_input.is_editing input{color:#202020}.ui-helper-hidden-accessible{display:none}.VS-interface.ui-autocomplete{position:absolute;border:1px solid #C0C0C0;border-top:1px solid #D9D9D9;background-color:#F6F6F6;cursor:pointer;z-index:10000;padding:0;margin:0;width:auto;min-width:80px;max-width:220px;max-height:240px;overflow-y:auto;overflow-x:hidden;font-size:13px;top:5px;opacity:.97;box-shadow:3px 4px 5px -2px rgba(0,0,0,0.5);-webkit-box-shadow:3px 4px 5px -2px rgba(0,0,0,0.5);-moz-box-shadow:3px 4px 5px -2px rgba(0,0,0,0.5)}.VS-interface.ui-autocomplete .ui-autocomplete-category{text-transform:capitalize;font-size:11px;padding:4px 4px 4px;border-top:1px solid #A2A2A2;border-bottom:1px solid #A2A2A2;background-color:#B7B7B7;text-shadow:0 -1px 0 #999;font-weight:bold;color:white;cursor:default}.VS-interface.ui-autocomplete .ui-menu-item{float:none}.VS-interface.ui-autocomplete .ui-menu-item a{color:#000;outline:none;display:block;padding:3px 4px 5px;border-radius:none;line-height:1;background-color:#F8F8F8;background-image:-moz-linear-gradient(top,#F8F8F8,#F3F3F3);background-image:-webkit-gradient(linear,left top,left bottom,from(#F8F8F8),to(#F3F3F3));background-image:linear-gradient(top,#F8F8F8,#F3F3F3);border-top:1px solid #FAFAFA;border-bottom:1px solid #f0f0f0}.VS-interface.ui-autocomplete .ui-menu-item a:active{outline:none}.VS-interface.ui-autocomplete .ui-menu-item .ui-state-hover,.VS-interface.ui-autocomplete .ui-menu-item .ui-state-focus{background-color:#6483F7;background-image:-moz-linear-gradient(top,#648bF5,#2465f3);background-image:-webkit-gradient(linear,left top,left bottom,from(#648bF5),to(#2465f3));background-image:linear-gradient(top,#648bF5,#2465f3);border-top:1px solid #5b83ec;border-bottom:1px solid #1459e9;border-left:none;border-right:none;color:white;margin:0}.VS-interface.ui-autocomplete .ui-corner-all{border-radius:0}.VS-interface.ui-autocomplete li{list-style:none;width:auto} \ No newline at end of file +.VS-search .VS-icon{background-repeat:no-repeat;background-position:center center;vertical-align:middle;width:16px;height:16px}.VS-search .VS-icon-cancel{width:11px;height:11px;background-position:center 0;background-image:url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAWCAYAAAAW5GZjAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAb9JREFUeNqUUr1qAkEQ3j0khQp6kihaeGgEEa18gTQR0iRY+BaBSMDGwidIEUKqFL6BopgqBAJ5AMFGjUU0d4WHEvwJarvZ77gRIzGYgb1hZr+Z75vZ40IIzqTNZrPj8Xicn0wmmcViEXS73aaqqq+BQODG6/W+A8MBNk3zfDAY3C6Xy0O2ZS6X6zMSiVwHg8FHLjtq7Xb7RQKj7BeTzVCgJ5PJU2U0GhUk7REuMpkMi8fjFggeMeecrVYrFRId0CgTAgDDMFg4HLbA8IjJgHNgGEr0er0fQIphUmZAwdSUADUB4RFDsz3oSMF6CLzZkQqgGebz+Z75dDqNdTqdp13bgDmdTj2VSp0oWHg0Gr2UNH2Z/9o+yMv7K4/HY/C/XhDUfr//jl7QQVT9fp/V63VWqVRYt9tliUSCZbPZg1wux9Lp9PqFeK1Wu9A0DdXz7YM87i0FrVZLs4Fi1wmFQh/NZjOmVKvVgq7rR/QflMtlixGedjwcDlUpMQ9tbzalkAAB2/R297mNW+sT2wUbUnA//V/nYrH4QOBNABUQuFQq3TNMuc82sDVrz41G42yvPeODAwZQ0QzwiJEnzLcAAwBJ6WXlwoBgZAAAAABJRU5ErkJggg==");cursor:pointer}.VS-search .VS-icon-cancel:hover{background-position:center -11px}.VS-search .VS-icon-search{width:12px;height:12px;background-image:url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAUZJREFUeNpUUM2qgmAQzS8NiUgLzTIXLZQW1QuI9AY9QPSW9gQ9QiriwpJQEBVrVWT2d7p2L9xZzDdzZs7M+YYqy/J8Ptu2vd/v4zgeDAaqqk4mE47jar9GnU6nzWbjOA5FUa/Xq0Jns9l8Pud5vkpp58cwAOzhcBhFkeu6GNztdg3D+Db5vo9nOp2iiWGYTqdDCMFe4LquI0aVpGmKR9M0lmUbjQY8YiBJklTb4YkoilBzOBzq9TogeMQIJEmqmlAlo9EIyXa7tSyrKAp4xEBkWUb5q2k8Hh+PR8/zwjCEgufz+aESstvtoKnVan2GgY31kBkEAfT1ej1FUZDiNIIgrFYr9H1ug3teLpfH43G/3/FBUJGu1+s8z8FZLpc0mmiabrfbf5fEumazuVgsTNO8Xq+3242qRNT+G0CMz7IMzH6//xZgAA60tj6rqzxpAAAAAElFTkSuQmCC")}.VS-search div,.VS-search span,.VS-search a,.VS-search img,.VS-search ul,.VS-search li,.VS-search form,.VS-search label,.VS-interface ul,.VS-interface li,.VS-interface{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline}.VS-search :focus{outline:0}.VS-search{line-height:1;color:black}.VS-search ol,.VS-search ul{list-style:none}.VS-search{font-family:Arial,sans-serif;color:#373737;font-size:12px}.VS-search input{display:block;border:none;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;outline:none;margin:0;padding:4px;background:transparent;font-size:16px;line-height:20px;width:100%}.VS-interface,.VS-search .dialog,.VS-search input{font-family:"Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,sans-serif!important;line-height:1.1em}.VS-search .VS-search-box{cursor:text;position:relative;background:transparent;border:2px solid #ccc;border-radius:16px;-webkit-border-radius:16px;-moz-border-radius:16px;background-color:#fafafa;-webkit-box-shadow:inset 0 0 3px #ccc;-moz-box-shadow:inset 0 0 3px #ccc;box-shadow:inset 0 0 3px #ccc;min-height:28px;height:auto}.VS-search.VS-readonly .VS-search-box{cursor:default}.VS-search .VS-search-box.VS-focus{border-color:#acf;-webkit-box-shadow:inset 0 0 3px #acf;-moz-box-shadow:inset 0 0 3px #acf;box-shadow:inset 0 0 3px #acf}.VS-search .VS-placeholder{position:absolute;top:7px;left:4px;margin:0 20px 0 22px;color:#808080;font-size:14px}.VS-search .VS-search-box.VS-focus .VS-placeholder,.VS-search .VS-search-box .VS-placeholder.VS-hidden,.VS-search .VS-search-box .VS-cancel-search-box.VS-hidden{display:none}.VS-search .VS-search-inner{position:relative;margin:0 20px 0 22px;overflow:hidden}.VS-search input{width:100px}.VS-search input,.VS-search .VS-input-width-tester{padding:6px 0;float:left;color:#808080;font:13px/17px Helvetica,Arial}.VS-search.VS-focus input{color:#606060}.VS-search .VS-icon-search{position:absolute;left:9px;top:8px}.VS-search .VS-icon-cancel{position:absolute;right:9px;top:8px}.VS-search.VS-readonly .VS-icon-cancel{display:none}.VS-search .search_facet{float:left;margin:0;padding:0 0 0 14px;position:relative;border:1px solid transparent;height:20px;margin:3px -3px 3px 0}.VS-search.VS-readonly .search_facet{padding-left:0}.VS-search .search_facet.is_selected{margin-left:-3px;-webkit-border-radius:16px;-moz-border-radius:16px;border-radius:16px;background-color:#d2e6fd;background-image:-moz-linear-gradient(top,#d2e6fd,#b0d1f9);background-image:-webkit-gradient(linear,left top,left bottom,from(#d2e6fd),to(#b0d1f9));background-image:linear-gradient(top,#d2e6fd,#b0d1f9);border:1px solid #6eadf5}.VS-search .search_facet .category{float:left;text-transform:uppercase;font-weight:bold;font-size:10px;color:#808080;padding:8px 0 5px;line-height:13px;cursor:pointer;padding:4px 0 0}.VS-search.VS-readonly .search_facet .category{cursor:default}.VS-search .search_facet.is_selected .category{margin-left:3px}.VS-search .search_facet .search_facet_input_container{float:left}.VS-search .search_facet input{margin:0;padding:0;color:#000;font-size:13px;line-height:16px;padding:5px 0 5px 4px;height:16px;width:auto;z-index:100;position:relative;padding-top:1px;padding-bottom:2px;padding-right:3px}.VS-search .search_facet.is_editing input,.VS-search .search_facet.is_selected input{color:#000}.VS-search.VS-readonly .search_facet .search_facet_remove{display:none}.VS-search .search_facet .search_facet_remove{position:absolute;left:0;top:4px}.VS-search .search_facet.is_selected .search_facet_remove{opacity:.4;left:3px;filter:alpha(opacity=40);background-position:center -11px}.VS-search .search_facet .search_facet_remove:hover{opacity:1}.VS-search .search_facet.is_editing .category,.VS-search .search_facet.is_selected .category{color:#000}.VS-search .search_facet.search_facet_maybe_delete .category,.VS-search .search_facet.search_facet_maybe_delete input{color:darkred}.VS-search .search_input{height:28px;float:left;margin-left:-1px}.VS-search .search_input input{padding:6px 3px 6px 2px;line-height:10px;height:22px;margin-top:-4px;width:10px;z-index:100;min-width:4px;position:relative}.VS-search .search_input.is_editing input{color:#202020}.ui-helper-hidden-accessible{display:none}.VS-interface.ui-autocomplete{position:absolute;border:1px solid #C0C0C0;border-top:1px solid #D9D9D9;background-color:#F6F6F6;cursor:pointer;z-index:10000;padding:0;margin:0;width:auto;min-width:80px;max-width:220px;max-height:240px;overflow-y:auto;overflow-x:hidden;font-size:13px;top:5px;opacity:.97;box-shadow:3px 4px 5px -2px rgba(0,0,0,0.5);-webkit-box-shadow:3px 4px 5px -2px rgba(0,0,0,0.5);-moz-box-shadow:3px 4px 5px -2px rgba(0,0,0,0.5)}.VS-interface.ui-autocomplete .ui-autocomplete-category{text-transform:capitalize;font-size:11px;padding:4px 4px 4px;border-top:1px solid #A2A2A2;border-bottom:1px solid #A2A2A2;background-color:#B7B7B7;text-shadow:0 -1px 0 #999;font-weight:bold;color:white;cursor:default}.VS-interface.ui-autocomplete .ui-menu-item{float:none}.VS-interface.ui-autocomplete .ui-menu-item a{color:#000;outline:none;display:block;padding:3px 4px 5px;border-radius:none;line-height:1;background-color:#F8F8F8;background-image:-moz-linear-gradient(top,#F8F8F8,#F3F3F3);background-image:-webkit-gradient(linear,left top,left bottom,from(#F8F8F8),to(#F3F3F3));background-image:linear-gradient(top,#F8F8F8,#F3F3F3);border-top:1px solid #FAFAFA;border-bottom:1px solid #f0f0f0}.VS-interface.ui-autocomplete .ui-menu-item a:active{outline:none}.VS-interface.ui-autocomplete .ui-menu-item .ui-state-hover,.VS-interface.ui-autocomplete .ui-menu-item .ui-state-focus{background-color:#6483F7;background-image:-moz-linear-gradient(top,#648bF5,#2465f3);background-image:-webkit-gradient(linear,left top,left bottom,from(#648bF5),to(#2465f3));background-image:linear-gradient(top,#648bF5,#2465f3);border-top:1px solid #5b83ec;border-bottom:1px solid #1459e9;border-left:none;border-right:none;color:white;margin:0}.VS-interface.ui-autocomplete .ui-corner-all{border-radius:0}.VS-interface.ui-autocomplete li{list-style:none;width:auto} \ No newline at end of file diff --git a/build-min/visualsearch-datauri.css.gz b/build-min/visualsearch-datauri.css.gz index 937ea1e8bb39ddbc08165c0ac3b7673aa81a9a13..d699e99a699348ed3e852e3fc983510a0fde0622 100644 GIT binary patch literal 2759 zcmV;&3OMy2iwFRAfFx7`1FcwVbD~NU{wuz_^;YdxG$Nvc)_%Y!UZN&m(8!mq0R|l9 zCKrvQ_P?JQK!d1B_SD&_jdP)UX1e=%y5W94EqD;P$|`q{yGXIEHyJ1!-L(TtEx6Eu zz^_|&(rcvF9NR-avaPxTEg!nM_@}Xhu8$O86o7$rt8OAyHDF_pRDV@3Rh`$y3L<^w zNBuwdm)jQOLNetENh1=Oka-Y}i3sNjh1i#_O%tP|%s~K<3%ry03RfdZ+DD(519- z&smA4#P8Lq$hX8MGZ9)|ShlA_q53cgrOkM&cc2`So2jksNS$p}r&N~pmZ{Fx^nB`2 z_M)p(9hVkIU0Nz~_T6E)t35Ks?y~q$d|9 z-`3noajY3btn0M{)%9L!8KN^BbG{q`W5e@Jx;UY^nmJnBc{6%1%A&;=i}Rwjbi2&> zsX5}C;y4h-+wyEQ3>233T5~sKN*#ti?4IFMi{DFQY8>uSziovBh3EIpes%F;?Cqv5 zkr?Bf{fSs%V?|``J(e*R$QaVV(>6r}`{jwlZ4t#0z;aLSI5s1L$f?`0s37o~B~+^HHRK>uTt1jL&>WR@0QE$q1b1i{ea%7#T^ssu*GAn zZ5Xr7)Yib|I+j?q!iBtk;wyp(iZ5HLZ+V=-J_l-Lw{e^btL*uwaHTX?!UhJ_&M5R% zz1+HM$(5bWSx*j)(4w=%5NJIN1;`AxL5~7+r(-@&xFKbjqP!k2*(GZBH^xk6mKz%x z&G4xiZn>F_fjRE=+ve6Zc*Ew}y~7Kr`O|~@$UDqyySZ72a%D?z*zW4?dBPUM{raJ; z2U>Us+EdTp`SznV2NvDYm*vu?xoPv-tOVC3L6ll()a&W4uyna@DbUM495`B+DR+wH zqRTHH*=8Dy&4-6?KhxoOyKIss#6UIs4B8_+>>org)Z*c0j3ZO;+|$( zeqkSD30W)XB0rw<{DT2AQz(S>5=H$#9%{fu#^LlxCMgqukv-D(s%y3qcyFiOQ)_Qz zrf>vxL$M9aDYAiqomOBQ=QhMr-tnlGeYV+K`i#7bfRXor<>6HqX^H;tD#0X?qXE*cxf)qG%j78B z%J?YJA+k|&<&lq9O=O)M%)Tc-5cqb=jHKs6tiv)6H%zKR4FraN+xBD>qckx?a$lfm zU$|`a)W?@4k9@eAJsU=z0#~+y5A${k1|VY}2R>~0wo|VW3_#6~Aale~jvxW6rAdL1 zT!N)YOT&k`tT(RMB72VfO_A)AWVphwC(!ytCN7aOo5zwT`pGa{S`D(Sw0TZgxoQnk zhG_;ieysnJ?@s)2g$%Rzh$ah>M8SuiPmYl=Se0zqz&qjBJK~=!Zm5^A+lwXa!CZz# zGI1UIAwFKBrb?0aQMq^-E>W0p*ajqS*pJ^1FQwfGb=So&z?W8a(}VHvZ$i$PdEYH{ znY<&6ka)euh%xn*PSls?#dKmw)Dox_$RF~bx_ODS!zBkPL>8oOUg92kzj5M+iVxMK z1c^n+e*cPkzrw~U4Xc`Z`5q7{C7B1f1)ZqC2Kj+~mro?}-(^ZIY242%qRCNDVzHV$ zxlE3zh&rOvf*q&7ND#a#B0d5CqPig&Q|E7X6}4`&>W z@Bc;LpSi+?CQedcqs{B0H>jVAn49_J*6%TOO||U+1^I{iJ<~XbSVKbw4*NPVoE7+y zJn)O5em4HW*M1Wg(S5Tu(?|L6{Q?Aa>UF9@_Om&GWbE|qjq2UdF{REbD7Lr(q{r6`!AQB zD4al?DFGDVARid`?rAHeaz&J~lm9n-&C{eE7n9s_W&I)+nl;kmswBBLl_Su^dG9;N zahGLDEVy4G9FbRwf{zViLMtd>Ni#|1pX1cBK{EN`hbSWoh>efi;{1ev| zsIa8{O%)qU;NLQ7|4kJe>x`?|MDJIt*o)&_4IhCg?RNNR6ls6ws5(#xkG`dy^j8|l z$n!C13Q>y9|2x^_%gKdjs|;HfYJcNdEFlY({CAqERILIB>qr{wi7>%(KAtRbeaX+W-E{02)-xX79RpYU3Q}o|*2xu5Nf-%nBX^uCmTO;x1Bb>s%5rxrRtz z`%(Y*!umflp>!1bX2PvC2X zIu`L@mC2(;>v?*ho_e~?;eV5vxbBKN>3ZbPvdyic-%3x~kWTM)$}juVxlBuxO7lla zXtkssi=FS{cTC;JdhpjN^icdR!RBhRgzH4#A3OD9^8&RZGX4&uV4@2PYrCLp& z4#M6_mrHBOeUNIEy~I$1LAaYwB===ge?^K#9ZXYMpziCeRt8|V+dZ^|=T5I$Tt0C1 zaci1C*Y=(M&qW8Kk1zk!L z2F_YECGMckM6M&Ym?_`!!m>RZ^VRk!l(xc7??E{vH&Z*ii8|k@PN^*G9aEie=*7&T z>}6l4dM+(a`m|JJ?T6!dUwdMT{Z+ADd|h`$%`Fx;MokbFb5?VTi)wkX+%2XnpY;tS z&f1dvBI%_=@WzfD_GQPzr_wTDIjW<+hPBnWUPBb`E~Jsi@Thb!d0}0gNSkMK@w8v) zyP7*K3Ysy-y54$F-5ivTAv$A$_2m#4TaIhd#VO6!%*pb>o6`qT7A>w=TokR9+h>I5 z)`V+`Lcj~V@_aH5lsfHo7H-ItdJKKszrg1XcaQ{12oGr3wZf6YafjBhx_mVbc1xE? zjB%~uRIGH}?NHbCfByOQv#A8GXS)r@Mg$?Bz^$>iF>v2ML05smFH=K2J^_|a0hYc5 z?0<&I1Nk#Rr)^jUqQ{E9o;9+Vcxo}?NXF0J9=C1uOD8f^kif$s7vm+hAVz3ju0qxG3`uUIbf zEpgZjN)KK=tn<>yQ7F?yKz21*t7zT81Yxkyz4_$1{anJ^e`~eBLk&J zn(dkwt3ZbF;}OI(pum&-$3&vyJn?P9!kF>oSnym!h`+4`&+B=yk zoIu@FYy)$OY+zug71+k54Y8DWI;v$~Z1$c$Bj+Mug zp5e3PL<>_hne9Vk4~g&d*LMCtWIDF%1AOKS|2~$WdCl{2ml*9mNhv;j^PA@!;X(uW zXbnOeSxBV z;j+^G>9g(hO|ESpO|+ zomn7*(ynh1O%@`Ff)72P93$bOD%rA$cfv1e#L5}QY?QF`iY4ra+!YsGMQ3cy_;`t$ zDn;67Mc=K{BWJVN2E_aI&)@NGrQHZS+2S`4N~^l-!T9$Vp;*kHAC|gJ!BM1>sLSHD zn7~SB0!y=7n%)z&1TY2ihy17RUgF|#$w3N{1*yB2ctqYWoW7yrLp3QRViB_6zar4D zaH>kfs;1sn^N~`LKY&}%i3)6xAJ}*KL?ZuPrqq(g{>%_fj(Qf0)#S-#azsVck!|0% z&AjH?=8r_@&%AH{IO)w${I%m;d-Qu1yG5(qwR`SS0Y21i_m~bNk_QV>Fp$cy5jYNX z69V|VA`tSPTf}`>Mzv%l5SGdr` zN$P8~nJs#U`l*PynLph6Bc`%c+YV5We{4K5%~OaqHDuthZvewtgCEHQ|1i|g=3jlY z_~W&b4~qJ|k%DBmblE}@Bl)GT0ZV;AGpePMO-NJ~nA8gt?xvwi%J6t8GlSnf+6@Lz zPN6B%em@2XAI-qDo)n7(peWGukZfeY=lnWH#0Z@zw&@UiXTaq)1GOpAP6;`onA2j1 zB`qU0^HtKW^FzuuRGK!=Oq!y+58Kt_8s;q-()4M3@(4qv%G<&*mOqc*l7jb|k;zp^ zQab~it)*Wy$}uBH%v>NZiLNe#A5=bSkCmTUZ#RFIxq8?6lfdWx%Uw?t&LF-j0TkdM z9~k)VX)C01MU=9W|95=N(WIRgliZTAeiI9=8fkG=lH8lh5oqGP_nl?g+p;7UJggCp z$c&=kbAy=B3JO@#Oj7xuad0V?11So;{N{4`UFT%FloPM&)=22`LsbS;>ZJWm6&p+7 z-!f_cO%)sKjH}p0?^mnXo8x4L56_WyKYTQbw7+vy11N+?-_uU|D-C4i`4}{XD8=Ug zoow>`DU?|Ri1>O9E04tp?sN$logBu) z*=u4iSh}~DCAU|c*{ejzv~@~CsvoaRo`6O*{dvQ%Xf{qMk$aZ;UXYVGX4xKQp^!0^ zFcGEVETb?>M5f#qZCjQdsANj-73#=oXN!HK{@n9_e$mT>q>LY%M>-i1l7iwLw!QpB zL}hVmZnw@(xZ~DN4kE!J#zGE`wiyWCwjodzwWyhBU3Ri%{3IFSlY(RgoJy7${x{2e z9JY3gc0jT$FV!h#Mb60)6w&@lgY?!nGPrbEb!ZzMC29tx*9@`+cmJaNnWFC}T|588(p*SIK<1Wzr*oQi^IlKUXeR?PioU9#!3;?` zQS6zH8O68-9Ox8+v)H+bqR8yJlEkbmw7JeI?&%+CclP!zz%h}N5FA6UW?4a%eO<@@dMl#=+Y&7?P8j0!M!iW&*HXV8Jj-Y&{%y`mFl(XTTO+IVPhd-6wH* zfZl*+@6hOy*|}U(Ht^FyIGYX2GTS^&t_)fO%W}fO_?mwo?;89V0K={x)uvlfxQZ4E z#V`oA!7Br}33@B^&wv~JIkc<~Km7AX zm1qfP1aT`1dZS8ASpkhBr;(zuX+bmz-uGS5dkq@L3%W_-eqUHI#mYmZyGIsakX!KG z#86CbLNA^tySo8WBWgpY*-U>>83$QZlTaun(n%skdTV&zO_aE;`3^9?PMoesZ#LkT zWIbwkXBrVj_d*`+Fv1GzR>6QhrC;Vbl@T;%t+p=&q-r&IJ;1Dka9d%>y3=xC3U}TL z>?Q^S_o@)HRJc&B#)8eFw!?1O$?^7u_Uf?$mq*B2MHr&#*^c8JG$4NswA#jip4Tcj z%dY7#oNJ z4q@*To*&4qdEnQTcNc$r=zz}x>ZQyj7*+1ddi8>- zovPTt>!ZO6J}O!-2WzJ+JREP+l7VO(VBIu}E{P&q6fEQe>C=C_2qGE6NhH!7?LCk# z{R;GlhodgY24d>N&pR9grTJllqgx*=+jur?Hb`ng-r06r-NU?^${=%qW5V!Z%OYFT=t*S z-Ef;E?z8|A$(es59CWv>VAYDMWShScUw>NQs1HqT89497!teJubXQ{Z_8d%2sCzfN z-LBu3Xu_8RgNPhx3N9NYrCI3$WokUhCPOID?*DhubBM z#yvYGZaQe{T9W9NNc6Rz-QBqVh1F5&#t&cFAFIqQB(wkpuuf5tUt I%|99d0P8kT82|tP delta 1691 zcmV;M24wl;4b2UIABzY8J}dZA0t2mBS#RSu5dJIf1_ctpvL#=!B^1TBMcRkHEw--# zB~dmTN)#w6iPy+~-x-mTsmpN|3nDQO&2Y|dMw|m!iyK zN79@ULTPlm#?C~$s30M|ZbDcMuMl>Bx!n}02+EapYT$#I@b@js1JF@I)7 zNw~g!&RICGNQya4LmJOflwz)BdDIWh@@)URxAZ*EUEMFYcR^IjLP$Rs4DY|7jDHYd zmeU2<9aL_Akb_>==2%$fShUUYb2Qeck9&U1dkWj~#q4=%EsLCF_L|rWmhSCk$?X+q z_9_uFZJm;k>c=Y^CnTaZ{dvQ%Xf{qMk$aZ;Zjh5WX4xKQp^!0^FcGEVETb?>M5de< zZA_LOsANj-73#=oXN!HKzUR8X>SaPw#*fV-otO`QNkQ=r+g^SmqOv$Ow_9f?+;M8J z29e+pR3Qh?+6)A5+YqRVTGULmE<4#WewK{zX+g3AP9;kW|C{AK4qLlLI|5mjm+BO= zB8MOXc|`P7TM_RIoK$>sLheO<@@dMl z#=+Y&`jL~R0!M!n%miS&zzSiM*t$6E^jY-_&VVhta!f}_x=-Tr0M(yn4TyAb%4Wc_ z%vQ3A_(7epnkF1fsQLF%t3iPQNb71)Z8{Z&qiCT}41+@(yfT2Bpa()L4;a(;zd^ zWu8+RL3`C|-a^2eR-4v?y*dcD6^5)kjRU4|rVoX1nM}t1>P_~3j$uXplF>q4!nrp|2?I4PYe3CRCl0iRa_qV+oYO2qO zsVfHNHoI-X!ic|%Zo<0f)U0|ba|uS3v$9^GU}~o-w&D6{u!4_@*2}@#DGL|J+pJ_D z8V6W6&7wo1h!zD4`9S(KuX9L-a1x0$M|*z{q)Wd7{psSU3$lTj`tYwEj)Btru))!- z50-6Q8#WsxwIJ_oyRGhFUd?i`sMobeR<70FI!8_4tY1yT+eKtl1&dmf*t>iCMPsQE zxk6?KUlQd$B)9Ig8ngA?(A&-XG@W;y_XsZgZ_?dxnk4SD01?TVA{=zLtzgxPs$`S! z1qFXz;HVExZ5cT4#lj!=ICNKH^mZqhno##{cDr4_EzyK82L=&2&=g!YNJ_KP0m{^r z^7r$gO*SDG1h&7qw7=`rrn8*b>02wJ_J^v0RN3PANEfRq;CG4R=X9}}r|x16-)p?iERbr<f005~2L(%{M diff --git a/build-min/visualsearch.js b/build-min/visualsearch.js index 8a95f17..e8e1f77 100644 --- a/build-min/visualsearch.js +++ b/build-min/visualsearch.js @@ -1,11 +1,11 @@ (function(){var $=jQuery;if(!window.VS)window.VS={};if(!VS.app)VS.app={};if(!VS.ui)VS.ui={};if(!VS.model)VS.model={};if(!VS.utils)VS.utils={};VS.VERSION='0.5.0';VS.VisualSearch=function(options){var defaults={container:'',query:'',autosearch:true,unquotable:[],remainder:'text',showFacets:true,readOnly:false,callbacks:{search:$.noop,focus:$.noop,blur:$.noop,facetMatches:$.noop,valueMatches:$.noop,clearSearch:$.noop,removedFacet:$.noop}};this.options=_.extend({},defaults,options);this.options.callbacks=_.extend({},defaults.callbacks,options.callbacks);VS.app.hotkeys.initialize();this.searchQuery=new VS.model.SearchQuery();this.searchBox=new VS.ui.SearchBox({app:this,showFacets:this.options.showFacets});if(options.container){var searchBox=this.searchBox.render().el;$(this.options.container).html(searchBox);} this.searchBox.value(this.options.query||'');$(window).bind('unload',function(e){});return this;};VS.init=function(options){return new VS.VisualSearch(options);};})();(function(){var $=jQuery;VS.ui.SearchBox=Backbone.View.extend({id:'search',events:{'click .VS-cancel-search-box':'clearSearch','mousedown .VS-search-box':'maybeFocusSearch','dblclick .VS-search-box':'highlightSearch','click .VS-search-box':'maybeTripleClick'},initialize:function(options){this.options=_.extend({},this.options,options);this.app=this.options.app;this.flags={allSelected:false};this.facetViews=[];this.inputViews=[];_.bindAll(this,'renderFacets','_maybeDisableFacets','disableFacets','deselectAllFacets','addedFacet','removedFacet','changedFacet');this.app.searchQuery.bind('reset',this.renderFacets).bind('add',this.addedFacet).bind('remove',this.removedFacet).bind('change',this.changedFacet);$(document).bind('keydown',this._maybeDisableFacets);},render:function(){$(this.el).append(JST['search_box']({readOnly:this.app.options.readOnly}));$(document.body).setMode('no','search');return this;},value:function(query){if(query==null)return this.serialize();return this.setQuery(query);},serialize:function(){var query=[];var inputViewsCount=this.inputViews.length;this.app.searchQuery.each(_.bind(function(facet,i){query.push(this.inputViews[i].value());query.push(facet.serialize());},this));if(inputViewsCount){query.push(this.inputViews[inputViewsCount-1].value());} -return _.compact(query).join(' ');},selected:function(){return _.select(this.facetViews,function(view){return view.modes.editing=='is'||view.modes.selected=='is';});},selectedModels:function(){return _.pluck(this.selected(),'model');},setQuery:function(query){this.currentQuery=query;VS.app.SearchParser.parse(this.app,query);},viewPosition:function(view){var views=view.type=='facet'?this.facetViews:this.inputViews;var position=_.indexOf(views,view);if(position==-1)position=0;return position;},searchEvent:function(e){var query=this.value();this.focusSearch(e);this.value(query);this.app.options.callbacks.search(query,this.app.searchQuery);},addFacet:function(category,initialQuery,position){category=VS.utils.inflector.trim(category);initialQuery=VS.utils.inflector.trim(initialQuery||'');if(!category)return;var model=new VS.model.SearchFacet({category:category,value:initialQuery||'',app:this.app});this.app.searchQuery.add(model,{at:position});},addedFacet:function(model){this.renderFacets();var facetView=_.detect(this.facetViews,function(view){if(view.model==model)return true;});_.defer(function(){facetView.enableEdit();});},changedFacet:function(){this.renderFacets();},removedFacet:function(facet,query,options){this.app.options.callbacks.removedFacet(facet,query,options);},renderFacets:function(){this.facetViews=[];this.inputViews=[];this.$('.VS-search-inner').empty();this.app.searchQuery.each(_.bind(this.renderFacet,this));this.renderSearchInput();this.renderPlaceholder();},renderFacet:function(facet,position){var view=new VS.ui.SearchFacet({app:this.app,model:facet,order:position});this.renderSearchInput();this.facetViews.push(view);this.$('.VS-search-inner').children().eq(position*2).after(view.render().el);view.calculateSize();_.defer(_.bind(view.calculateSize,view));return view;},renderSearchInput:function(){var input=new VS.ui.SearchInput({position:this.inputViews.length,app:this.app,showFacets:this.options.showFacets});this.$('.VS-search-inner').append(input.render().el);this.inputViews.push(input);},renderPlaceholder:function(){var $placeholder=this.$('.VS-placeholder');if(this.app.searchQuery.length||_.any(this.inputViews,function(view){return view.value()!="";})){$placeholder.addClass("VS-hidden");}else{$placeholder.removeClass("VS-hidden").text(this.app.options.placeholder);}},clearSearch:function(e){if(this.app.options.readOnly)return;var actualClearSearch=_.bind(function(){this.disableFacets();this.value('');this.flags.allSelected=false;this.searchEvent(e);this.focusSearch(e);},this);if(this.app.options.callbacks.clearSearch!=$.noop){this.app.options.callbacks.clearSearch(actualClearSearch);}else{actualClearSearch();}},selectAllFacets:function(){this.flags.allSelected=true;$(document).one('click.selectAllFacets',this.deselectAllFacets);_.each(this.facetViews,function(facetView,i){facetView.selectFacet();});_.each(this.inputViews,function(inputView,i){inputView.selectText();});},allSelected:function(deselect){if(deselect)this.flags.allSelected=false;return this.flags.allSelected;},deselectAllFacets:function(e){this.disableFacets();if(this.$(e.target).is('.category,input')){var el=$(e.target).closest('.search_facet,.search_input');var view=_.detect(this.facetViews.concat(this.inputViews),function(v){return v.el==el[0];});if(view.type=='facet'){view.selectFacet();}else if(view.type=='input'){_.defer(function(){view.enableEdit(true);});}}},disableFacets:function(keepView){_.each(this.inputViews,function(view){if(view&&view!=keepView&&(view.modes.editing=='is'||view.modes.selected=='is')){view.disableEdit();}});_.each(this.facetViews,function(view){if(view&&view!=keepView&&(view.modes.editing=='is'||view.modes.selected=='is')){view.disableEdit();view.deselectFacet();}});this.flags.allSelected=false;this.removeFocus();$(document).unbind('click.selectAllFacets');},resizeFacets:function(view){_.each(this.facetViews,function(facetView,i){if(!view||facetView==view){facetView.resize();}});},_maybeDisableFacets:function(e){if(this.flags.allSelected&&VS.app.hotkeys.key(e)=='backspace'){e.preventDefault();this.clearSearch(e);return false;}else if(this.flags.allSelected&&VS.app.hotkeys.printable(e)){this.clearSearch(e);}},focusNextFacet:function(currentView,direction,options){options=options||{};var viewCount=this.facetViews.length;var viewPosition=options.viewPosition||this.viewPosition(currentView);if(!options.skipToFacet){if(currentView.type=='text'&&direction>0)direction-=1;if(currentView.type=='facet'&&direction<0)direction+=1;}else if(options.skipToFacet&¤tView.type=='text'&&viewCount==viewPosition&&direction>=0){return false;} +return _.compact(query).join(' ');},selected:function(){return _.select(this.facetViews,function(view){return view.modes.editing=='is'||view.modes.selected=='is';});},selectedModels:function(){return _.pluck(this.selected(),'model');},setQuery:function(query){this.currentQuery=query;VS.app.SearchParser.parse(this.app,query);},viewPosition:function(view){var views=view.type=='facet'?this.facetViews:this.inputViews;var position=_.indexOf(views,view);if(position==-1)position=0;return position;},searchEvent:function(e){var query=this.value();this.focusSearch(e);this.value(query);this.app.options.callbacks.search(query,this.app.searchQuery);},addFacet:function(category,initialQuery,position){category=VS.utils.inflector.trim(category);initialQuery=VS.utils.inflector.trim(initialQuery||'');if(!category)return;var model=new VS.model.SearchFacet({category:category,value:initialQuery||'',app:this.app});this.app.searchQuery.add(model,{at:position});},addedFacet:function(model){this.renderFacets();var facetView=_.detect(this.facetViews,function(view){if(view.model==model)return true;});_.defer(function(){facetView.enableEdit();});},changedFacet:function(){this.renderFacets();},removedFacet:function(facet,query,options){this.app.options.callbacks.removedFacet(facet,query,options);},renderFacets:function(){this.facetViews=[];this.inputViews=[];this.$('.VS-search-inner').empty();this.app.searchQuery.each(_.bind(this.renderFacet,this));this.renderSearchInput();this.renderCancel();this.renderPlaceholder();},renderFacet:function(facet,position){var view=new VS.ui.SearchFacet({app:this.app,model:facet,order:position});this.renderSearchInput();this.facetViews.push(view);this.$('.VS-search-inner').children().eq(position*2).after(view.render().el);view.calculateSize();_.defer(_.bind(view.calculateSize,view));return view;},renderSearchInput:function(){var input=new VS.ui.SearchInput({position:this.inputViews.length,app:this.app,showFacets:this.options.showFacets});this.$('.VS-search-inner').append(input.render().el);this.inputViews.push(input);},_isSearchEmpty:function(){var hasSearchInputs=_.any(this.inputViews,function(view){return view.value().length});return this.app.searchQuery.length||hasSearchInputs;},renderPlaceholder:function(){var $placeholder=this.$('.VS-placeholder');if(this._isSearchEmpty()){$placeholder.addClass("VS-hidden");}else{$placeholder.removeClass("VS-hidden").text(this.app.options.placeholder);}},renderCancel:function(){var hideCancel=!this._isSearchEmpty();this.$('.VS-cancel-search-box').toggleClass("VS-hidden",hideCancel);},clearSearch:function(e){if(this.app.options.readOnly)return;var actualClearSearch=_.bind(function(){this.disableFacets();this.value('');this.flags.allSelected=false;this.searchEvent(e);this.focusSearch(e);},this);if(this.app.options.callbacks.clearSearch!=$.noop){this.app.options.callbacks.clearSearch(actualClearSearch);}else{actualClearSearch();}},selectAllFacets:function(){this.flags.allSelected=true;$(document).one('click.selectAllFacets',this.deselectAllFacets);_.each(this.facetViews,function(facetView,i){facetView.selectFacet();});_.each(this.inputViews,function(inputView,i){inputView.selectText();});},allSelected:function(deselect){if(deselect)this.flags.allSelected=false;return this.flags.allSelected;},deselectAllFacets:function(e){this.disableFacets();if(this.$(e.target).is('.category,input')){var el=$(e.target).closest('.search_facet,.search_input');var view=_.detect(this.facetViews.concat(this.inputViews),function(v){return v.el==el[0];});if(view.type=='facet'){view.selectFacet();}else if(view.type=='input'){_.defer(function(){view.enableEdit(true);});}}},disableFacets:function(keepView){_.each(this.inputViews,function(view){if(view&&view!=keepView&&(view.modes.editing=='is'||view.modes.selected=='is')){view.disableEdit();}});_.each(this.facetViews,function(view){if(view&&view!=keepView&&(view.modes.editing=='is'||view.modes.selected=='is')){view.disableEdit();view.deselectFacet();}});this.flags.allSelected=false;this.removeFocus();$(document).unbind('click.selectAllFacets');},resizeFacets:function(view){_.each(this.facetViews,function(facetView,i){if(!view||facetView==view){facetView.resize();}});},_maybeDisableFacets:function(e){if(this.flags.allSelected&&VS.app.hotkeys.key(e)=='backspace'){e.preventDefault();this.clearSearch(e);return false;}else if(this.flags.allSelected&&VS.app.hotkeys.printable(e)){this.clearSearch(e);}},focusNextFacet:function(currentView,direction,options){options=options||{};var viewCount=this.facetViews.length;var viewPosition=options.viewPosition||this.viewPosition(currentView);if(!options.skipToFacet){if(currentView.type=='text'&&direction>0)direction-=1;if(currentView.type=='facet'&&direction<0)direction+=1;}else if(options.skipToFacet&¤tView.type=='text'&&viewCount==viewPosition&&direction>=0){return false;} var view,next=Math.min(viewCount,viewPosition+direction);if(currentView.type=='text'){if(next>=0&&next=viewCount||next<0){view=_.last(this.inputViews);view.enableEdit();}else{view=this.facetViews[next];view.enableEdit();view.setCursorAtEnd(direction||options.startAtEnd);}}else{view=this.inputViews[next];view.enableEdit();}} if(options.selectText)view.selectText();this.resizeFacets();return true;},maybeFocusSearch:function(e){if(this.app.options.readOnly)return;if($(e.target).is('.VS-search-box')||$(e.target).is('.VS-search-inner')||e.type=='keydown'){this.focusSearch(e);}},focusSearch:function(e,selectText){if(this.app.options.readOnly)return;var view=this.inputViews[this.inputViews.length-1];view.enableEdit(selectText);if(!selectText)view.setCursorAtEnd(-1);if(e.type=='keydown'){view.keydown(e);view.box.trigger('keydown');} -_.defer(_.bind(function(){if(!this.$('input:focus').length){view.enableEdit(selectText);}},this));},highlightSearch:function(e){if(this.app.options.readOnly)return;if($(e.target).is('.VS-search-box')||$(e.target).is('.VS-search-inner')||e.type=='keydown'){var lastinput=this.inputViews[this.inputViews.length-1];lastinput.startTripleClickTimer();this.focusSearch(e,true);}},maybeTripleClick:function(e){var lastinput=this.inputViews[this.inputViews.length-1];return lastinput.maybeTripleClick(e);},addFocus:function(){if(this.app.options.readOnly)return;this.app.options.callbacks.focus();this.$('.VS-search-box').addClass('VS-focus');},removeFocus:function(){this.app.options.callbacks.blur();var focus=_.any(this.facetViews.concat(this.inputViews),function(view){return view.isFocused();});if(!focus)this.$('.VS-search-box').removeClass('VS-focus');this.renderPlaceholder();},showFacetCategoryMenu:function(e){e.preventDefault();e.stopPropagation();if(this.facetCategoryMenu&&this.facetCategoryMenu.modes.open=='is'){return this.facetCategoryMenu.close();} +_.defer(_.bind(function(){if(!this.$('input:focus').length){view.enableEdit(selectText);}},this));},highlightSearch:function(e){if(this.app.options.readOnly)return;if($(e.target).is('.VS-search-box')||$(e.target).is('.VS-search-inner')||e.type=='keydown'){var lastinput=this.inputViews[this.inputViews.length-1];lastinput.startTripleClickTimer();this.focusSearch(e,true);}},maybeTripleClick:function(e){var lastinput=this.inputViews[this.inputViews.length-1];return lastinput.maybeTripleClick(e);},addFocus:function(){if(this.app.options.readOnly)return;this.app.options.callbacks.focus();this.$('.VS-search-box').addClass('VS-focus');},removeFocus:function(){this.app.options.callbacks.blur();var focus=_.any(this.facetViews.concat(this.inputViews),function(view){return view.isFocused();});if(!focus)this.$('.VS-search-box').removeClass('VS-focus');this.renderCancel();this.renderPlaceholder();},showFacetCategoryMenu:function(e){e.preventDefault();e.stopPropagation();if(this.facetCategoryMenu&&this.facetCategoryMenu.modes.open=='is'){return this.facetCategoryMenu.close();} var items=[{title:'Account',onClick:_.bind(this.addFacet,this,'account','')},{title:'Project',onClick:_.bind(this.addFacet,this,'project','')},{title:'Filter',onClick:_.bind(this.addFacet,this,'filter','')},{title:'Access',onClick:_.bind(this.addFacet,this,'access','')}];var menu=this.facetCategoryMenu||(this.facetCategoryMenu=new dc.ui.Menu({items:items,standalone:true}));this.$('.VS-icon-search').after(menu.render().open().content);return false;}});})();(function(){var $=jQuery;VS.ui.SearchFacet=Backbone.View.extend({type:'facet',className:'search_facet',events:{'click .category':'selectFacet','keydown input':'keydown','mousedown input':'enableEdit','mouseover .VS-icon-cancel':'showDelete','mouseout .VS-icon-cancel':'hideDelete','click .VS-icon-cancel':'remove'},initialize:function(options){this.options=_.extend({},this.options,options);this.flags={canClose:false};_.bindAll(this,'set','keydown','deselectFacet','deferDisableEdit');this.app=this.options.app;},render:function(){$(this.el).html(JST['search_facet']({model:this.model,readOnly:this.app.options.readOnly}));this.setMode('not','editing');this.setMode('not','selected');this.box=this.$('input');this.box.val(this.model.label());this.box.bind('blur',this.deferDisableEdit);this.box.bind('input propertychange',this.keydown);this.setupAutocomplete();return this;},calculateSize:function(){this.box.autoGrowInput();this.box.unbind('updated.autogrow');this.box.bind('updated.autogrow',_.bind(this.moveAutocomplete,this));},resize:function(e){this.box.trigger('resize.autogrow',e);},setupAutocomplete:function(){this.box.autocomplete({source:_.bind(this.autocompleteValues,this),minLength:0,delay:0,autoFocus:true,position:{offset:"0 5"},create:_.bind(function(e,ui){$(this.el).find('.ui-autocomplete-input').css('z-index','auto');},this),select:_.bind(function(e,ui){e.preventDefault();var originalValue=this.model.get('value');this.set(ui.item.value);if(originalValue!=ui.item.value||this.box.val()!=ui.item.value){if(this.app.options.autosearch){this.search(e);}else{this.app.searchBox.renderFacets();this.app.searchBox.focusNextFacet(this,1,{viewPosition:this.options.order});}} return false;},this),open:_.bind(function(e,ui){var box=this.box;this.box.autocomplete('widget').find('.ui-menu-item').each(function(){var $value=$(this),autoCompleteData=$value.data('item.autocomplete')||$value.data('ui-autocomplete-item');if(autoCompleteData['value']==box.val()&&box.data('ui-autocomplete').menu.activate){box.data('ui-autocomplete').menu.activate(new $.Event("mouseover"),$value);}});},this)});this.box.autocomplete('widget').addClass('VS-interface');},moveAutocomplete:function(){var autocomplete=this.box.data('ui-autocomplete');if(autocomplete){autocomplete.menu.element.position({my:"left top",at:"left bottom",of:this.box.data('ui-autocomplete').element,collision:"flip",offset:"0 5"});}},searchAutocomplete:function(e){var autocomplete=this.box.data('ui-autocomplete');if(autocomplete){var menu=autocomplete.menu.element;autocomplete.search();menu.outerWidth(Math.max(menu.width('').outerWidth(),autocomplete.element.outerWidth()));}},closeAutocomplete:function(){var autocomplete=this.box.data('ui-autocomplete');if(autocomplete)autocomplete.close();},autocompleteValues:function(req,resp){var category=this.model.get('category');var value=this.model.get('value');var searchTerm=req.term;this.app.options.callbacks.valueMatches(category,searchTerm,function(matches,options){options=options||{};matches=matches||[];if(searchTerm&&value!=searchTerm){if(options.preserveMatches){resp(matches);}else{var re=VS.utils.inflector.escapeRegExp(searchTerm||'');var matcher=new RegExp('\\b'+re,'i');matches=$.grep(matches,function(item){return matcher.test(item)||matcher.test(item.value)||matcher.test(item.label);});}} if(options.preserveOrder){resp(matches);}else{resp(_.sortBy(matches,function(match){if(match==value||match.value==value)return'';else return match;}));}});},set:function(value){if(!value)return;this.model.set({'value':value});},search:function(e,direction){if(!direction)direction=1;this.closeAutocomplete();this.app.searchBox.searchEvent(e);_.defer(_.bind(function(){this.app.searchBox.focusNextFacet(this,direction,{viewPosition:this.options.order});},this));},enableEdit:function(){if(this.app.options.readOnly)return;if(this.modes.editing!='is'){this.setMode('is','editing');this.deselectFacet();if(this.box.val()==''){this.box.val(this.model.get('value'));}} @@ -33,4 +33,4 @@ if(category&&value){var searchFacet=new VS.model.SearchFacet({category:category, if(originalQuery==query)break;} return facets;},_extractNextField:function(query){var textRe=new RegExp('^\\s*(\\S+)\\s+(?='+QUOTES_RE+FREETEXT_RE+')');var textMatch=query.match(textRe);if(textMatch&&textMatch.length>=1){return textMatch[1];}else{return this._extractFirstField(query);}},_extractFirstField:function(query){var fields=query.match(this.ALL_FIELDS);return fields&&fields.length&&fields[0];},_extractSearchText:function(query){query=query||'';var text=VS.utils.inflector.trim(query.replace(this.ALL_FIELDS,''));return text;}};})();(function(){var $=jQuery;VS.model.SearchFacet=Backbone.Model.extend({serialize:function(){var category=this.quoteCategory(this.get('category'));var value=VS.utils.inflector.trim(this.get('value'));var remainder=this.get("app").options.remainder;if(!value)return'';if(!_.contains(this.get("app").options.unquotable||[],category)&&category!=remainder){value=this.quoteValue(value);} if(category!=remainder){category=category+': ';}else{category="";} -return category+value;},quoteCategory:function(category){var hasDoubleQuote=(/"/).test(category);var hasSingleQuote=(/'/).test(category);var hasSpace=(/\s/).test(category);if(hasDoubleQuote&&!hasSingleQuote){return"'"+category+"'";}else if(hasSpace||(hasSingleQuote&&!hasDoubleQuote)){return'"'+category+'"';}else{return category;}},quoteValue:function(value){var hasDoubleQuote=(/"/).test(value);var hasSingleQuote=(/'/).test(value);if(hasDoubleQuote&&!hasSingleQuote){return"'"+value+"'";}else{return'"'+value+'"';}},label:function(){return this.get('label')||this.get('value');}});})();(function(){var $=jQuery;VS.model.SearchQuery=Backbone.Collection.extend({model:VS.model.SearchFacet,serialize:function(){return this.map(function(facet){return facet.serialize();}).join(' ');},facets:function(){return this.map(function(facet){var value={};value[facet.get('category')]=facet.get('value');return value;});},find:function(category){var facet=this.detect(function(facet){return facet.get('category').toLowerCase()==category.toLowerCase();});return facet&&facet.get('value');},count:function(category){return this.select(function(facet){return facet.get('category').toLowerCase()==category.toLowerCase();}).length;},values:function(category){var facets=this.select(function(facet){return facet.get('category').toLowerCase()==category.toLowerCase();});return _.map(facets,function(facet){return facet.get('value');});},has:function(category,value){return this.any(function(facet){var categoryMatched=facet.get('category').toLowerCase()==category.toLowerCase();if(!value)return categoryMatched;return categoryMatched&&facet.get('value')==value;});},withoutCategory:function(){var categories=_.map(_.toArray(arguments),function(cat){return cat.toLowerCase();});return this.map(function(facet){if(!_.include(categories,facet.get('category').toLowerCase())){return facet.serialize();};}).join(' ');}});})();(function(){window.JST=window.JST||{};window.JST['search_box']=_.template('
\n
\n
\n
\n
\n
\n
\n
');window.JST['search_facet']=_.template('<% if (model.has(\'category\')) { %>\n
<%= model.get(\'category\') %>:
\n<% } %>\n\n
\n disabled="disabled"<% } %> />\n
\n\n
');window.JST['search_input']=_.template('disabled="disabled"<% } %> />');})(); \ No newline at end of file +return category+value;},quoteCategory:function(category){var hasDoubleQuote=(/"/).test(category);var hasSingleQuote=(/'/).test(category);var hasSpace=(/\s/).test(category);if(hasDoubleQuote&&!hasSingleQuote){return"'"+category+"'";}else if(hasSpace||(hasSingleQuote&&!hasDoubleQuote)){return'"'+category+'"';}else{return category;}},quoteValue:function(value){var hasDoubleQuote=(/"/).test(value);var hasSingleQuote=(/'/).test(value);if(hasDoubleQuote&&!hasSingleQuote){return"'"+value+"'";}else{return'"'+value+'"';}},label:function(){return this.get('label')||this.get('value');}});})();(function(){var $=jQuery;VS.model.SearchQuery=Backbone.Collection.extend({model:VS.model.SearchFacet,serialize:function(){return this.map(function(facet){return facet.serialize();}).join(' ');},facets:function(){return this.map(function(facet){var value={};value[facet.get('category')]=facet.get('value');return value;});},find:function(category){var facet=this.detect(function(facet){return facet.get('category').toLowerCase()==category.toLowerCase();});return facet&&facet.get('value');},count:function(category){return this.select(function(facet){return facet.get('category').toLowerCase()==category.toLowerCase();}).length;},values:function(category){var facets=this.select(function(facet){return facet.get('category').toLowerCase()==category.toLowerCase();});return _.map(facets,function(facet){return facet.get('value');});},has:function(category,value){return this.any(function(facet){var categoryMatched=facet.get('category').toLowerCase()==category.toLowerCase();if(!value)return categoryMatched;return categoryMatched&&facet.get('value')==value;});},withoutCategory:function(){var categories=_.map(_.toArray(arguments),function(cat){return cat.toLowerCase();});return this.map(function(facet){if(!_.include(categories,facet.get('category').toLowerCase())){return facet.serialize();};}).join(' ');}});})();(function(){window.JST=window.JST||{};window.JST['search_box']=_.template('
\n
\n
\n
\n
\n
\n
\n
\n');window.JST['search_facet']=_.template('<% if (model.has(\'category\')) { %>\n
<%= model.get(\'category\') %>:
\n<% } %>\n\n
\n disabled="disabled"<% } %> />\n
\n\n
');window.JST['search_input']=_.template('disabled="disabled"<% } %> />');})(); \ No newline at end of file diff --git a/build-min/visualsearch.js.gz b/build-min/visualsearch.js.gz index 34bb68c8146c477a04aecca06c218d74ea0e56ec..e78312958a9a17e84612c199f0f60675e32f59e4 100644 GIT binary patch literal 8497 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 literal 8437 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 X>x{+p?lX}\n
\n
\n
\n
\n
\n
\n');window.JST['search_facet']=_.template('<% if (model.has(\'category\')) { %>\n
<%= model.get(\'category\') %>:
\n<% } %>\n\n
\n disabled="disabled"<% } %> />\n
\n\n
');window.JST['search_input']=_.template('disabled="disabled"<% } %> />');})(); \ No newline at end of file +(function(){window.JST=window.JST||{};window.JST['search_box']=_.template('
\n
\n
\n
\n
\n
\n
\n
\n');window.JST['search_facet']=_.template('<% if (model.has(\'category\')) { %>\n
<%= model.get(\'category\') %>:
\n<% } %>\n\n
\n disabled="disabled"<% } %> />\n
\n\n
');window.JST['search_input']=_.template('disabled="disabled"<% } %> />');})(); \ No newline at end of file diff --git a/build-min/visualsearch_templates.js.gz b/build-min/visualsearch_templates.js.gz index d1309fd30fe99b91c746e72adf29983d8f1a4649..a3dc4686c0516ed09289a21fd7855a986b2e9ac2 100644 GIT binary patch delta 356 zcmV-q0h|8t0`>w3ABzY8c7P;Qkq8}s?1flz>?m<~2>ADIUgZ_2)RWh{Gv3)9zxb=l z2&b&^gTq!CX}9CI#Yc1wkH^DldcJ;nCGtX~$L zu*Jb_1Zo9-fn2^Dy$|33qdAr9grx-4Pn2Qv*Z>SZ5mKvgTkt%`05is&NZxdjKgIMbJ{$=&q^6d;OKwx)>V@ zFW$M7l_--}E}@k;u9^)tU7IXZxP4B;JKQ<;mACdal$iDsVA>@XS}mJehC+~ z7ET%+M!U7txmge2W*^Bp-0ydX@%j1{RLHGZW^=O%zLRX|uqYLG7zUGEu0SYWRSEl? z#U2Nf0mub}7J2@z)i#1145m~*CJZI0exMASrW&C4iI`f&Ys5e9Uh0)NS zEt*XyBLel~Nx#6QQ90VDxVEv>`VZih0Kv6Db-eoMQa?E96edh4%E7(VF7js(^%=1s z@$S|Nzx2Z7sD?{kg=rwD@MG*Y4I=Ns?Y=tz^&ceQsXyqhsl zm$l1i4UWrZYfaZC3vOG|=ngkcjy>i=E#m@p-K{~w`PTY?7pFyboAqu1MFD}1zB*X&%06g8RZ2$lO diff --git a/build/visualsearch-datauri.css b/build/visualsearch-datauri.css index 54e39ac..3ff0e90 100644 --- a/build/visualsearch-datauri.css +++ b/build/visualsearch-datauri.css @@ -111,7 +111,8 @@ Source: http://meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/ font-size: 14px; } .VS-search .VS-search-box.VS-focus .VS-placeholder, - .VS-search .VS-search-box .VS-placeholder.VS-hidden { + .VS-search .VS-search-box .VS-placeholder.VS-hidden, + .VS-search .VS-search-box .VS-cancel-search-box.VS-hidden { display: none; } .VS-search .VS-search-inner { diff --git a/build/visualsearch.css b/build/visualsearch.css index 06083fe..2191089 100644 --- a/build/visualsearch.css +++ b/build/visualsearch.css @@ -7,7 +7,7 @@ .VS-search .VS-icon-cancel { width: 11px; height: 11px; background-position: center 0; - background-image: url(../images/embed/icons/cancel_search.png?1311104738); + background-image: url(../images/embed/icons/cancel_search.png?1411660636); cursor: pointer; } .VS-search .VS-icon-cancel:hover { @@ -15,7 +15,7 @@ } .VS-search .VS-icon-search { width: 12px; height: 12px; - background-image: url(../images/embed/icons/search_glyph.png?1311104738); + background-image: url(../images/embed/icons/search_glyph.png?1411660636); } /*------------------------------ RESET + DEFAULT STYLES ---------------------------------*/ @@ -111,7 +111,8 @@ Source: http://meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/ font-size: 14px; } .VS-search .VS-search-box.VS-focus .VS-placeholder, - .VS-search .VS-search-box .VS-placeholder.VS-hidden { + .VS-search .VS-search-box .VS-placeholder.VS-hidden, + .VS-search .VS-search-box .VS-cancel-search-box.VS-hidden { display: none; } .VS-search .VS-search-inner { diff --git a/build/visualsearch.js b/build/visualsearch.js index 8d51a5f..ce3a0a7 100644 --- a/build/visualsearch.js +++ b/build/visualsearch.js @@ -242,6 +242,7 @@ VS.ui.SearchBox = Backbone.View.extend({ // Add on an n+1 empty search input on the very end. this.renderSearchInput(); + this.renderCancel(); this.renderPlaceholder(); }, @@ -275,10 +276,15 @@ VS.ui.SearchBox = Backbone.View.extend({ this.inputViews.push(input); }, + _isSearchEmpty : function() { + var hasSearchInputs = _.any(this.inputViews, function(view) { return view.value().length }); + return this.app.searchQuery.length || hasSearchInputs; + }, + // Handles showing/hiding the placeholder text renderPlaceholder : function() { var $placeholder = this.$('.VS-placeholder'); - if (this.app.searchQuery.length || _.any(this.inputViews, function(view) { return view.value() != ""; })) { + if (this._isSearchEmpty()) { $placeholder.addClass("VS-hidden"); } else { $placeholder.removeClass("VS-hidden") @@ -286,6 +292,12 @@ VS.ui.SearchBox = Backbone.View.extend({ } }, + // Handles showing/hiding the search box cancel/clear button + renderCancel : function() { + var hideCancel = !this._isSearchEmpty(); + this.$('.VS-cancel-search-box').toggleClass("VS-hidden", hideCancel); + }, + // # Modifying Facets # // Clears out the search box. Command+A + delete can trigger this, as can a cancel button. @@ -508,6 +520,7 @@ VS.ui.SearchBox = Backbone.View.extend({ return view.isFocused(); }); if (!focus) this.$('.VS-search-box').removeClass('VS-focus'); + this.renderCancel(); this.renderPlaceholder(); }, @@ -1964,7 +1977,7 @@ VS.model.SearchQuery = Backbone.Collection.extend({ (function(){ window.JST = window.JST || {}; -window.JST['search_box'] = _.template('
\n
\n
\n
\n
\n
\n
\n
'); +window.JST['search_box'] = _.template('
\n
\n
\n
\n
\n
\n
\n
\n'); window.JST['search_facet'] = _.template('<% if (model.has(\'category\')) { %>\n
<%= model.get(\'category\') %>:
\n<% } %>\n\n
\n disabled="disabled"<% } %> />\n
\n\n
'); window.JST['search_input'] = _.template('disabled="disabled"<% } %> />'); })(); \ No newline at end of file diff --git a/lib/css/workspace.css b/lib/css/workspace.css index 498d6ff..1e18174 100644 --- a/lib/css/workspace.css +++ b/lib/css/workspace.css @@ -60,7 +60,8 @@ font-size: 14px; } .VS-search .VS-search-box.VS-focus .VS-placeholder, - .VS-search .VS-search-box .VS-placeholder.VS-hidden { + .VS-search .VS-search-box .VS-placeholder.VS-hidden, + .VS-search .VS-search-box .VS-cancel-search-box.VS-hidden { display: none; } .VS-search .VS-search-inner { diff --git a/lib/js/templates/search_box.jst b/lib/js/templates/search_box.jst index 137075f..df709b3 100644 --- a/lib/js/templates/search_box.jst +++ b/lib/js/templates/search_box.jst @@ -3,6 +3,6 @@
-
+
- \ No newline at end of file + diff --git a/lib/js/templates/templates.js b/lib/js/templates/templates.js index 9c3e33b..5f0173c 100644 --- a/lib/js/templates/templates.js +++ b/lib/js/templates/templates.js @@ -1,7 +1,7 @@ (function(){ window.JST = window.JST || {}; -window.JST['search_box'] = _.template('
\n
\n
\n
\n
\n
\n
\n
'); +window.JST['search_box'] = _.template('
\n
\n
\n
\n
\n
\n
\n
\n'); window.JST['search_facet'] = _.template('<% if (model.has(\'category\')) { %>\n
<%= model.get(\'category\') %>:
\n<% } %>\n\n
\n disabled="disabled"<% } %> />\n
\n\n
'); window.JST['search_input'] = _.template('disabled="disabled"<% } %> />'); })(); \ No newline at end of file diff --git a/lib/js/views/search_box.js b/lib/js/views/search_box.js index 8d0f7ba..f751da9 100644 --- a/lib/js/views/search_box.js +++ b/lib/js/views/search_box.js @@ -161,6 +161,7 @@ VS.ui.SearchBox = Backbone.View.extend({ // Add on an n+1 empty search input on the very end. this.renderSearchInput(); + this.renderCancel(); this.renderPlaceholder(); }, @@ -194,10 +195,15 @@ VS.ui.SearchBox = Backbone.View.extend({ this.inputViews.push(input); }, + _isSearchEmpty : function() { + var hasSearchInputs = _.any(this.inputViews, function(view) { return view.value().length }); + return this.app.searchQuery.length || hasSearchInputs; + }, + // Handles showing/hiding the placeholder text renderPlaceholder : function() { var $placeholder = this.$('.VS-placeholder'); - if (this.app.searchQuery.length || _.any(this.inputViews, function(view) { return view.value() != ""; })) { + if (this._isSearchEmpty()) { $placeholder.addClass("VS-hidden"); } else { $placeholder.removeClass("VS-hidden") @@ -205,6 +211,12 @@ VS.ui.SearchBox = Backbone.View.extend({ } }, + // Handles showing/hiding the search box cancel/clear button + renderCancel : function() { + var hideCancel = !this._isSearchEmpty(); + this.$('.VS-cancel-search-box').toggleClass("VS-hidden", hideCancel); + }, + // # Modifying Facets # // Clears out the search box. Command+A + delete can trigger this, as can a cancel button. @@ -427,6 +439,7 @@ VS.ui.SearchBox = Backbone.View.extend({ return view.isFocused(); }); if (!focus) this.$('.VS-search-box').removeClass('VS-focus'); + this.renderCancel(); this.renderPlaceholder(); },