Merge branch 'issue-sidebar-size' into 'master'

Changes the width of sidebar in issues and MRs when affix event fires Fixes #1320 Width is set when Bootstraps affix event is fired and then removed when it reaches the top or bottom. See merge request !464

Merge branch 'issue-sidebar-size' into 'master'
aedc1254 · Drew Blessing · 965b92a7 · 81ff63d6 · aedc1254 · aedc1254
Commit aedc1254 authored Apr 03, 2015 by Drew Blessing
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

issue.js.coffee app/assets/javascripts/issue.js.coffee +4 -0

merge_request.js.coffee app/assets/javascripts/merge_request.js.coffee +4 -1

No files found.
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -18,3 +18,7 @@ class @Issue
          @top = ($('.issuable-affix').offset().top - 70)
        bottom: ->
          @bottom = $('.footer').outerHeight(true)
+      $('.issuable-affix').on 'affix.bs.affix', ->
+        $(@).width($(@).outerWidth())
+      .on 'affixed-top.bs.affix affixed-bottom.bs.affix', ->
+        $(@).width('')
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -26,6 +26,10 @@ class @MergeRequest
          @top = ($('.issuable-affix').offset().top - 70)
        bottom: ->
          @bottom = $('.footer').outerHeight(true)
+      $('.issuable-affix').on 'affix.bs.affix', ->
+        $(@).width($(@).outerWidth())
+      .on 'affixed-top.bs.affix affixed-bottom.bs.affix', ->
+        $(@).width('')

  # Local jQuery finder
  $: (selector) ->
@@ -160,4 +164,3 @@ class @MergeRequest
          else
            setTimeout(merge_request.mergeInProgress, 3000)
      dataType: 'json'
-