diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-19 01:15:49 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-19 01:15:49 +0300 |
| commit | 442db0801aea1f11163e7e128da6cbcf2823c5cd (patch) | |
| tree | 95f63e0438dcb3a157d72d4382662a22c73a5cb5 /app/assets | |
| parent | 6776dcf90b9e101b8c9341ea83621e48f87584d6 (diff) | |
| parent | 5a8d73243a7b68f2724a6d5f9d482dda24e9dfe4 (diff) | |
Merge branch 'master' into ci-build-list
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/issuable_context.js.coffee | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/issuable_context.js.coffee b/app/assets/javascripts/issuable_context.js.coffee index 176d9cabefa..c4d3e619f5e 100644 --- a/app/assets/javascripts/issuable_context.js.coffee +++ b/app/assets/javascripts/issuable_context.js.coffee @@ -11,12 +11,13 @@ class @IssuableContext $(this).submit() $('.issuable-details').waitForImages -> + $('.issuable-affix').on 'affix.bs.affix', -> + $(@).width($(@).outerWidth()) + .on 'affixed-top.bs.affix affixed-bottom.bs.affix', -> + $(@).width('') + $('.issuable-affix').affix offset: top: -> @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('') |