diff --git a/app/assets/javascripts/darkswarm/directives/disable_enter.js.coffee b/app/assets/javascripts/darkswarm/directives/disable_enter.js.coffee index 9385b390a1..352ed85fd6 100644 --- a/app/assets/javascripts/darkswarm/directives/disable_enter.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/disable_enter.js.coffee @@ -5,5 +5,3 @@ Darkswarm.directive "ofnDisableEnter", ()-> code = e.keyCode || e.which if code == 13 e.preventDefault() - - diff --git a/app/views/darkswarm/index.html.haml b/app/views/darkswarm/index.html.haml index 79b6641801..49e8412207 100644 --- a/app/views/darkswarm/index.html.haml +++ b/app/views/darkswarm/index.html.haml @@ -23,7 +23,7 @@ .row .large-9.columns - %input{type: :text, "ng-model" => "query", value: "Search postcode, suburb or hub name...", + %input{type: :text, "ng-model" => "query", placeholder: "Search postcode, suburb or hub name...", "ofn-disable-enter" => true} .large-3.columns Advanced search diff --git a/app/views/shared/_hubs.rabl b/app/views/shared/_hubs.rabl index 832a9c5028..fb8e226f42 100644 --- a/app/views/shared/_hubs.rabl +++ b/app/views/shared/_hubs.rabl @@ -2,7 +2,7 @@ collection Enterprise.is_distributor attributes :name, :id child :address do - attributes :city + attributes :city, :zipcode node :state do |address| address.state.abbr end