diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-07-06 21:11:44 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-07-08 13:54:11 +0100 |
| commit | 32e593c66323a2cc5cd3b25070c9ae8db725f5be (patch) | |
| tree | 5c14b309567588cd917fa4fb891747b1273c7479 | |
| parent | ea1827c9a491de719be6a084fc092b88b1f54600 (diff) | |
| download | gitlab-ce-32e593c66323a2cc5cd3b25070c9ae8db725f5be.tar.gz | |
review changes
| -rw-r--r-- | app/assets/javascripts/diff.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/single_file_diff.js.coffee (renamed from app/assets/javascripts/single_diff.js.coffee) | 9 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 4 |
5 files changed, 9 insertions, 11 deletions
diff --git a/app/assets/javascripts/diff.js.coffee b/app/assets/javascripts/diff.js.coffee index 49c43c09983..feb908c1abb 100644 --- a/app/assets/javascripts/diff.js.coffee +++ b/app/assets/javascripts/diff.js.coffee @@ -1,7 +1,7 @@ class @Diff UNFOLD_COUNT = 20 constructor: -> - $('.files .diff-file').singleDiff() + $('.files .diff-file').singleFileDiff() $(document).off('click', '.js-unfold') $(document).on('click', '.js-unfold', (event) => diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 728ee5a2aa2..d55c4a34c07 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -160,7 +160,7 @@ class @MergeRequestTabs $('#diffs').html data.html gl.utils.localTimeAgo($('.js-timeago', 'div#diffs')) $('#diffs .js-syntax-highlight').syntaxHighlight() - $('#diffs .diff-file').singleDiff() + $('#diffs .diff-file').singleFileDiff() @expandViewContainer() if @diffViewType() is 'parallel' @diffsLoaded = true @scrollToElement("#diffs") diff --git a/app/assets/javascripts/single_diff.js.coffee b/app/assets/javascripts/single_file_diff.js.coffee index 884d5d43d03..f3e225c3728 100644 --- a/app/assets/javascripts/single_diff.js.coffee +++ b/app/assets/javascripts/single_file_diff.js.coffee @@ -1,4 +1,4 @@ -class @SingleDiff +class @SingleFileDiff WRAPPER = '<div class="diff-content diff-wrap-lines"></div>' LOADING_HTML = '<i class="fa fa-spinner fa-spin"></i>' @@ -24,7 +24,6 @@ class @SingleDiff $('.file-title > a', @file).on 'click', @toggleDiff toggleDiff: (e) => - e.preventDefault() @isOpen = !@isOpen if not @isOpen and not @hasError @content.hide() @@ -49,7 +48,7 @@ class @SingleDiff @collapsedContent.after(@content) return -$.fn.singleDiff = -> +$.fn.singleFileDiff = -> return @each -> - if not $.data this, 'singleDiff' - $.data this, 'singleDiff', new SingleDiff this + if not $.data this, 'singleFileDiff' + $.data this, 'singleFileDiff', new SingleFileDiff this diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 41e77a4ac68..24b1ebab4b0 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -16,6 +16,9 @@ font-weight: normal; font-size: 16px; line-height: 36px; + &.diff-collapsed { + cursor: pointer; + } } .row-content-block { diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 02480689f09..71e4b50f2af 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -189,7 +189,3 @@ span.idiff { border-bottom-right-radius: 2px; } } - -.nothing-here-block.diff-collapsed { - cursor: pointer; -} |