From 81ff63d6849773f4cb5720bbcacfa92c93548f9b Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 26 Mar 2015 21:23:31 +0000 Subject: Changes the width of sidebar in issues and MRs when affix event fires --- app/assets/javascripts/issue.js.coffee | 4 ++++ app/assets/javascripts/merge_request.js.coffee | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'app/assets') diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee index bf71c144eaf..89c17ed4dc2 100644 --- a/app/assets/javascripts/issue.js.coffee +++ b/app/assets/javascripts/issue.js.coffee @@ -22,3 +22,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('') diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee index 6127d2bb480..8ce5a3645c6 100644 --- 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) -> @@ -164,4 +168,3 @@ class @MergeRequest else setTimeout(merge_request.mergeInProgress, 3000) dataType: 'json' - -- cgit v1.2.1