diff options
| author | Simon Knox <psimyn@gmail.com> | 2018-03-27 21:24:41 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2018-03-27 21:24:41 +1100 |
| commit | 842a17976419842220e9528d8b43ee7fa157a33b (patch) | |
| tree | 464ff769e57c6d5c355d0b4e4387df29513807b7 | |
| parent | 9cd5b8992e7ba048e77ca013dbc4e80830b4ef9a (diff) | |
| download | gitlab-ce-842a17976419842220e9528d8b43ee7fa157a33b.tar.gz | |
fix Hide Whitespace button
| -rw-r--r-- | app/assets/javascripts/diffs/components/changed_files.vue | 21 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 2 |
2 files changed, 20 insertions, 3 deletions
diff --git a/app/assets/javascripts/diffs/components/changed_files.vue b/app/assets/javascripts/diffs/components/changed_files.vue index dee3dbf95d0..24443ed2db7 100644 --- a/app/assets/javascripts/diffs/components/changed_files.vue +++ b/app/assets/javascripts/diffs/components/changed_files.vue @@ -4,6 +4,8 @@ import { mapGetters, mapActions } from 'vuex'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import Icon from '~/vue_shared/components/icon.vue'; import { pluralize } from '~/lib/utils/text_utility'; +import { getParameterValues, mergeUrlParams } from '~/lib/utils/url_utility'; +import { __ } from '~/locale'; export default { components: { @@ -44,6 +46,21 @@ export default { stickyClass() { return this.isStuck ? 'is-stuck' : ''; }, + whitespaceVisible() { + return !getParameterValues('w')[0]; + }, + toggleWhitespaceText() { + if (this.whitespaceVisible) { + return __('Hide whitespace changes'); + } + return __('Show whitespace changes'); + }, + toggleWhitespacePath() { + if (this.whitespaceVisible) { + return mergeUrlParams({w: 1}, window.location.href); + } + return mergeUrlParams({w: 0}, window.location.href); + }, }, mounted() { this.throttledHandleScroll = _.throttle(this.handleScroll, 100); @@ -116,9 +133,9 @@ export default { > <a class="hidden-xs btn btn-default" - href="/fatihacet/test/merge_requests/5/diffs?w=1&TODO" + :href="toggleWhitespacePath" > - {{ __('Hide whitespace changes') }} + {{ toggleWhitespaceText }} </a> <div class="btn-group"> <button diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index 6029738f437..8ee2e5291df 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -88,7 +88,7 @@ #pipelines.pipelines.tab-pane - if @pipelines.any? = render 'projects/commit/pipelines_list', disable_initialization: true, endpoint: pipelines_project_merge_request_path(@project, @merge_request) - #js-diffs-app.diffs.tab-pane{ data: { "is-locked" => @merge_request.discussion_locked?, endpoint: diffs_project_merge_request_path(@project, @merge_request, 'json') } } + #js-diffs-app.diffs.tab-pane{ data: { "is-locked" => @merge_request.discussion_locked?, endpoint: diffs_project_merge_request_path(@project, @merge_request, 'json', { w: '1' }) } } - unless has_vue_discussions_cookie? # TODO: @fatihacet This should be deleted after refactor #diffs |