Merge branch 'filter-bug-fix' into 'master'

Fix bug with JS error from dropdowns in filter area Fixes: ![consoleerror](/uploads/0fa19a943050baac855c9e6f896ea941/consoleerror.png) This error is not a logged issue yet. Error when turbolinks fetches a new page, `setup()` was not run. Signed-off-by: Jacob Schatz jschatz@gitlab.com cc @iamphill @alfredo1 See merge request !3216

Merge branch 'filter-bug-fix' into 'master'
94031420 · Dmitriy Zaporozhets · 19ecfb5c · 4fc2dcc4 · 94031420
Commit 94031420 authored Mar 15, 2016 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

breakpoints.coffee app/assets/javascripts/breakpoints.coffee +8 -4

No files found.
--- a/app/assets/javascripts/breakpoints.coffee
+++ b/app/assets/javascripts/breakpoints.coffee
@@ -10,7 +10,6 @@ class @Breakpoints
    setup: ->
      allDeviceSelector = BREAKPOINTS.map (breakpoint) ->
        ".device-#{breakpoint}"
-
      return if $(allDeviceSelector.join(",")).length

      # Create all the elements
@@ -18,12 +17,17 @@ class @Breakpoints
        "<div class='device-#{breakpoint} visible-#{breakpoint}'></div>"
      $("body").append els.join('')

-    getBreakpointSize: ->
+    visibleDevice: ->
      allDeviceSelector = BREAKPOINTS.map (breakpoint) ->
        ".device-#{breakpoint}"
+      $(allDeviceSelector.join(",")).filter(":visible")

-      $visibleDevice = $(allDeviceSelector.join(",")).filter(":visible")
-
+    getBreakpointSize: ->
+      $visibleDevice = @visibleDevice
+      # the page refreshed via turbolinks
+      if not $visibleDevice().length
+        @setup()
+      $visibleDevice = @visibleDevice()
      return $visibleDevice.attr("class").split("visible-")[1]

  @get: ->