diff options
| author | Yuriy Glukhov <yglukhov@users.noreply.github.com> | 2014-08-13 14:04:13 +0300 |
|---|---|---|
| committer | uran <uran@zeoalliance.com> | 2014-08-27 11:21:58 +0300 |
| commit | 0bf45aece390a474ae01feb7d237878cb9e37c04 (patch) | |
| tree | 58c85081e5bd1d53a45a5248d8ebb90948242f43 /app/assets | |
| parent | 070e3964dcf5e61a97618913af75fdc878f71871 (diff) | |
| download | gitlab-ce-0bf45aece390a474ae01feb7d237878cb9e37c04.tar.gz | |
Added a checkbox to toggle line wrapping in diff.
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/behaviors/toggle_diff_line_wrap_behavior.coffee | 14 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/diff.scss | 11 |
2 files changed, 23 insertions, 2 deletions
diff --git a/app/assets/javascripts/behaviors/toggle_diff_line_wrap_behavior.coffee b/app/assets/javascripts/behaviors/toggle_diff_line_wrap_behavior.coffee new file mode 100644 index 00000000000..691ed4f98ae --- /dev/null +++ b/app/assets/javascripts/behaviors/toggle_diff_line_wrap_behavior.coffee @@ -0,0 +1,14 @@ +$ -> + # Toggle line wrapping in diff. + # + # %div.diff-file + # %input.js-toggle-diff-line-wrap + # %td.line_content + # + $("body").on "click", ".js-toggle-diff-line-wrap", (e) -> + diffFile = $(@).closest(".diff-file") + if $(@).is(":checked") + diffFile.addClass("diff-wrap-lines") + else + diffFile.removeClass("diff-wrap-lines") + diff --git a/app/assets/stylesheets/sections/diff.scss b/app/assets/stylesheets/sections/diff.scss index 488d06919b0..758f15c8013 100644 --- a/app/assets/stylesheets/sections/diff.scss +++ b/app/assets/stylesheets/sections/diff.scss @@ -125,8 +125,6 @@ } .line_content { display: block; - white-space: pre; - height: 18px; margin: 0px; padding: 0px 0.5em; border: none; @@ -341,3 +339,12 @@ margin: 0; border: none; } + +.diff-file .line_content { + white-space: pre; +} + +.diff-wrap-lines .line_content { + white-space: pre-wrap; +} + |