mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-26 01:33:22 +00:00
Basic implementation of single line selectors
This commit is contained in:
@@ -9,6 +9,9 @@ Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Products, OrderCycle,
|
||||
$scope.limit = 3
|
||||
$scope.order_cycle = OrderCycle.order_cycle
|
||||
|
||||
$scope.$watch "Products.loading", (newValue, oldValue) ->
|
||||
$scope.$broadcast("loadTaxonSelectors") if !newValue
|
||||
|
||||
$scope.incrementLimit = ->
|
||||
if $scope.limit < Products.products.length
|
||||
$scope.limit = $scope.limit + 1
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
Darkswarm.directive 'singleLineSelector', ($timeout) ->
|
||||
restrict: 'E'
|
||||
link: (scope,element,attrs) ->
|
||||
scope.activeTaxons = []
|
||||
scope.taxonSelectors = []
|
||||
|
||||
# From: http://stackoverflow.com/questions/4298612/jquery-how-to-call-resize-event-only-once-its-finished-resizing
|
||||
debouncer = (func, timeout) ->
|
||||
timeoutID = undefined
|
||||
timeout = timeout or 200
|
||||
->
|
||||
subject = this
|
||||
args = arguments
|
||||
clearTimeout timeoutID
|
||||
timeoutID = setTimeout(->
|
||||
func.apply subject, Array::slice.call(args)
|
||||
, timeout)
|
||||
|
||||
fit = ->
|
||||
used = $(element).find("li.more").outerWidth(true)
|
||||
available = $(element).parent(".filter-box").innerWidth()
|
||||
$(element).find("li").not(".more").each (i) ->
|
||||
used += $(this).outerWidth(true)
|
||||
scope.taxonSelectors[i].fits = used <= available
|
||||
return null # So we don't exit the loop on false
|
||||
|
||||
scope.$watchCollection "taxonSelectors", ->
|
||||
selector.fits = true for selector in scope.taxonSelectors
|
||||
$timeout fit, 0, true
|
||||
|
||||
$(window).resize debouncer (e) ->
|
||||
scope.$apply -> selector.fits = true for selector in scope.taxonSelectors
|
||||
$timeout fit, 0, true
|
||||
@@ -5,7 +5,8 @@ Darkswarm.directive "taxonSelector", (FilterSelectorsService)->
|
||||
replace: true
|
||||
scope:
|
||||
objects: "&"
|
||||
results: "="
|
||||
activeTaxons: "="
|
||||
taxonSelectors: "="
|
||||
templateUrl: "taxon_selector.html"
|
||||
|
||||
link: (scope, elem, attr)->
|
||||
@@ -13,14 +14,17 @@ Darkswarm.directive "taxonSelector", (FilterSelectorsService)->
|
||||
selectors = null # To get scoping/closure right
|
||||
|
||||
scope.emit = ->
|
||||
scope.results = selectors.filter (selector)->
|
||||
scope.activeTaxons = selectors.filter (selector)->
|
||||
selector.active
|
||||
.map (selector)->
|
||||
selector.taxon.id
|
||||
|
||||
scope.$on 'loadTaxonSelectors', ->
|
||||
scope.taxonSelectors = scope.selectors()
|
||||
|
||||
# Build hash of unique taxons, each of which gets an ActiveSelector
|
||||
scope.selectors = ->
|
||||
taxons = {}
|
||||
taxons = {}
|
||||
selectors = []
|
||||
for object in scope.objects()
|
||||
for taxon in object.taxons
|
||||
@@ -28,7 +32,7 @@ Darkswarm.directive "taxonSelector", (FilterSelectorsService)->
|
||||
if object.supplied_taxons
|
||||
for taxon in object.supplied_taxons
|
||||
taxons[taxon.id] = taxon
|
||||
|
||||
|
||||
# Generate a selector for each taxon.
|
||||
# NOTE: THESE ARE MEMOIZED to stop new selectors from being created constantly, otherwise function always returns non-identical results
|
||||
# This means the $digest cycle can never close and times out
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
%active-selector{"ng-repeat" => "selector in selectors()"}
|
||||
%render-svg{path: "{{selector.taxon.icon}}"}
|
||||
%active-selector{"ng-repeat" => "selector in taxonSelectors", "ng-show" => "selector.fits"}
|
||||
%render-svg{path: "{{selector.taxon.icon}}"}
|
||||
%span {{ selector.taxon.name }}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@import mixins
|
||||
@import branding
|
||||
@import big-input
|
||||
@import animations
|
||||
@import animations
|
||||
|
||||
// Alert when search, taxon, filter is triggered
|
||||
|
||||
@@ -27,6 +27,10 @@
|
||||
.filter-box.filter-box-shopfront, .filter-box.property-box-shopfront
|
||||
background: transparent
|
||||
|
||||
single-line-selector
|
||||
overflow-x: hidden
|
||||
white-space: nowrap
|
||||
|
||||
ul
|
||||
margin: 0
|
||||
ul, ul li
|
||||
@@ -35,11 +39,11 @@
|
||||
display: inline-block
|
||||
@include border-radius(0)
|
||||
padding: 0
|
||||
margin: 0 0 0.25rem 0.25rem
|
||||
margin: 0 0 0.25rem 0.25rem
|
||||
&:hover, &:focus
|
||||
background: transparent
|
||||
|
||||
li.active
|
||||
|
||||
li.active
|
||||
@include box-shadow(none)
|
||||
a, a:hover, a:focus, a:active, a.active
|
||||
border: 1px solid $clr-blue
|
||||
@@ -52,7 +56,7 @@
|
||||
li a
|
||||
@include border-radius(0.5em)
|
||||
border: 1px solid $clr-blue-light
|
||||
padding: 0.625em
|
||||
padding: 0.625em
|
||||
font-size: 0.875em
|
||||
color: $clr-blue
|
||||
font-size: 0.75em
|
||||
@@ -77,7 +81,7 @@
|
||||
|
||||
// Shopfront properties
|
||||
.filter-box.property-box-shopfront
|
||||
li.active
|
||||
li.active
|
||||
@include box-shadow(none)
|
||||
a, a:hover, a:focus, a:active, a.active
|
||||
border: 1px solid #333
|
||||
@@ -89,4 +93,3 @@
|
||||
&:hover, &:focus
|
||||
border: 1px solid #999
|
||||
color: #666
|
||||
|
||||
|
||||
@@ -1,45 +1,43 @@
|
||||
.filter-box.filter-box-shopfront.animate-hide.text-right
|
||||
%ul
|
||||
%taxon-selector{objects: "Products.products | products:query | products:showProfiles",
|
||||
results: "activeTaxons"}
|
||||
%single-line-selector
|
||||
%ul
|
||||
%taxon-selector{objects: "Products.products | products:query | products:showProfiles",
|
||||
"active-taxons" => "activeTaxons", "taxon-selectors" => "taxonSelectors" }
|
||||
|
||||
%li
|
||||
%a
|
||||
%span
|
||||
+ 7 more
|
||||
%i.ofn-i_052-point-down
|
||||
%li.more
|
||||
%a
|
||||
%span
|
||||
+ {{ (taxonSelectors | filter:{ fits: false }).length }} more
|
||||
%i.ofn-i_052-point-down
|
||||
|
||||
/ TODO: Needs controller for Angular Bootstrap directive for dropdown:
|
||||
/ {"ng-controller" => "DropdownCtrl"}
|
||||
|
||||
/ %li
|
||||
/ .btn-group{:dropdown => "", "is-open" => "status.isopen"}
|
||||
/ %button.btn.btn-primary.dropdown-toggle{"dropdown-toggle" => "", "ng-disabled" => "disabled", :type => "button"}
|
||||
/ + 7 more
|
||||
/ %span.caret
|
||||
/ %ul.dropdown-menu{:role => "menu"}
|
||||
/ %li
|
||||
/ %a{:href => "#"} Action
|
||||
/ %li
|
||||
/ %a{:href => "#"} Another action
|
||||
/ %li
|
||||
/ %a{:href => "#"} Something else here
|
||||
/ %li.divider
|
||||
/ %li
|
||||
/ %a{:href => "#"} Separated link
|
||||
/ TODO: Needs controller for Angular Bootstrap directive for dropdown:
|
||||
/ {"ng-controller" => "DropdownCtrl"}
|
||||
|
||||
.filter-box.property-box-shopfront.animate-hide.text-right
|
||||
%ul
|
||||
%li
|
||||
%a Organic Certified
|
||||
%li
|
||||
%a Free Range
|
||||
%li
|
||||
%a Biodynamic
|
||||
%li
|
||||
%a
|
||||
+ 2 more
|
||||
%span.caret
|
||||
/ %li
|
||||
/ .btn-group{:dropdown => "", "is-open" => "status.isopen"}
|
||||
/ %button.btn.btn-primary.dropdown-toggle{"dropdown-toggle" => "", "ng-disabled" => "disabled", :type => "button"}
|
||||
/ + 7 more
|
||||
/ %span.caret
|
||||
/ %ul.dropdown-menu{:role => "menu"}
|
||||
/ %li
|
||||
/ %a{:href => "#"} Action
|
||||
/ %li
|
||||
/ %a{:href => "#"} Another action
|
||||
/ %li
|
||||
/ %a{:href => "#"} Something else here
|
||||
/ %li.divider
|
||||
/ %li
|
||||
/ %a{:href => "#"} Separated link
|
||||
|
||||
|
||||
|
||||
-# .filter-box.property-box-shopfront.animate-hide.text-right
|
||||
-# %ul
|
||||
-# %li
|
||||
-# %a Organic Certified
|
||||
-# %li
|
||||
-# %a Free Range
|
||||
-# %li
|
||||
-# %a Biodynamic
|
||||
-# %li
|
||||
-# %a
|
||||
-# + 2 more
|
||||
-# %span.caret
|
||||
|
||||
Reference in New Issue
Block a user