From b1b1bfd8f6bd1d460f5cb7dee2066eab741b1510 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 24 Apr 2015 16:05:39 +1000 Subject: [PATCH] Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page --- .../darkswarm/directives/single_line_selectors.coffee | 1 + .../javascripts/templates/single_line_selectors.html.haml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee b/app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee index 97e03cb689..93896a41f9 100644 --- a/app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee +++ b/app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee @@ -4,6 +4,7 @@ Darkswarm.directive 'singleLineSelectors', ($timeout, $filter) -> scope: objects: "&" activeSelectors: "=" + selectorName: "@activeSelectors" link: (scope,element,attrs) -> scope.fitting = false diff --git a/app/assets/javascripts/templates/single_line_selectors.html.haml b/app/assets/javascripts/templates/single_line_selectors.html.haml index e1e96e904a..d54ce57bbb 100644 --- a/app/assets/javascripts/templates/single_line_selectors.html.haml +++ b/app/assets/javascripts/templates/single_line_selectors.html.haml @@ -3,12 +3,12 @@ %filter-selector{objects: "objects()", "active-selectors" => "activeSelectors", "all-selectors" => "allSelectors" } %li.more{ ng: { show: "overFlowSelectors().length > 0 || fitting" } } - %a.dropdown{ data: { dropdown: "show-more" }, ng: { class: "{active: selectedOverFlowSelectors().length > 0}" } } + %a.dropdown{ data: { dropdown: "{{ 'show-more-' + selectorName }}" }, ng: { class: "{active: selectedOverFlowSelectors().length > 0}" } } %span + {{ overFlowSelectors().length }} more %i.ofn-i_052-point-down - .f-dropdown.text-right.content#show-more + .f-dropdown.text-right.content{ ng: { attr: { id: "{{ 'show-more-' + selectorName }}" } } } %ul %active-selector{ ng: { repeat: "selector in overFlowSelectors()", hide: "selector.fits" } } - %render-svg{path: "{{selector.object.icon}}"} + %render-svg{path: "{{selector.object.icon}}", ng: { if: "selector.object.icon"}} %span {{ selector.object.name }}