From b332b9fd3ff16c0b184e19c4f010fa82ff234840 Mon Sep 17 00:00:00 2001 From: Geoffry Song Date: Tue, 25 Mar 2014 10:38:15 -0400 Subject: [PATCH] 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.