diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-09 20:30:47 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-09 20:30:47 +0000 |
| commit | 5ae02354b478458859bffeba7d444535ddbe811c (patch) | |
| tree | f0038332d0e5f74f7030bc63d08fdcc30a6f79df /app/assets/javascripts | |
| parent | f60ba0786ffa48b27293808cb7eceb0972fe5972 (diff) | |
| parent | 83e2bfbae04385e09dae924629ac6a9e22b3ad4c (diff) | |
| download | gitlab-ce-5ae02354b478458859bffeba7d444535ddbe811c.tar.gz | |
Merge branch 'revert-0ef587b6' into 'master'
Responsive title in diffs inline, side by side, with and without sidebar
Closes #25709
See merge request !8707
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/diff.js.es6 | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/single_file_diff.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/diff.js.es6 b/app/assets/javascripts/diff.js.es6 index c39e30fb7e0..ccccd0a36ff 100644 --- a/app/assets/javascripts/diff.js.es6 +++ b/app/assets/javascripts/diff.js.es6 @@ -76,7 +76,7 @@ require('./lib/utils/url_utility'); const diffFile = diffTitle.closest('.diff-file'); const nothingHereBlock = $('.nothing-here-block:visible', diffFile); if (nothingHereBlock.length) { - const clickTarget = $('.file-title, .click-to-expand', diffFile); + const clickTarget = $('.js-file-title, .click-to-expand', diffFile); diffFile.data('singleFileDiff').toggleDiff(clickTarget, () => { this.highlighSelectedLine(); if (cb) cb(); diff --git a/app/assets/javascripts/single_file_diff.js b/app/assets/javascripts/single_file_diff.js index 5b20c63384c..3ee0c73a8d2 100644 --- a/app/assets/javascripts/single_file_diff.js +++ b/app/assets/javascripts/single_file_diff.js @@ -33,13 +33,13 @@ this.$toggleIcon.addClass('fa-caret-down'); } - $('.file-title, .click-to-expand', this.file).on('click', (function (e) { + $('.js-file-title, .click-to-expand', this.file).on('click', (function (e) { this.toggleDiff($(e.target)); }).bind(this)); } SingleFileDiff.prototype.toggleDiff = function($target, cb) { - if (!$target.hasClass('file-title') && !$target.hasClass('click-to-expand') && !$target.hasClass('diff-toggle-caret')) return; + if (!$target.hasClass('js-file-title') && !$target.hasClass('click-to-expand') && !$target.hasClass('diff-toggle-caret')) return; this.isOpen = !this.isOpen; if (!this.isOpen && !this.hasError) { this.content.hide(); |