summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/notes
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-08-17 19:25:56 +0200
committerDouwe Maan <douwe@selenight.nl>2017-08-17 19:25:56 +0200
commit9c22974cd14f41ed156ced0a6742dbae7412b0db (patch)
tree0fffe3714559e8574b4ac4d3b99d1253e1a879d5 /app/assets/javascripts/notes
parent09338e397c95b51a7c515524d7f3eb5f4eed2fb4 (diff)
downloadgitlab-ce-9c22974cd14f41ed156ced0a6742dbae7412b0db.tar.gz
Rename a few attribute suffixes from `_url` to `_path`
Diffstat (limited to 'app/assets/javascripts/notes')
-rw-r--r--app/assets/javascripts/notes/components/issue_comment_form.vue16
-rw-r--r--app/assets/javascripts/notes/components/issue_note_form.vue16
-rw-r--r--app/assets/javascripts/notes/index.js4
3 files changed, 18 insertions, 18 deletions
diff --git a/app/assets/javascripts/notes/components/issue_comment_form.vue b/app/assets/javascripts/notes/components/issue_comment_form.vue
index d80fc4bd373..7d69dbc807f 100644
--- a/app/assets/javascripts/notes/components/issue_comment_form.vue
+++ b/app/assets/javascripts/notes/components/issue_comment_form.vue
@@ -71,13 +71,13 @@
'js-note-target-reopen': !this.isIssueOpen,
};
},
- markdownDocsUrl() {
- return this.getNotesData.markdownDocs;
+ markdownDocsPath() {
+ return this.getNotesData.markdownDocsPath;
},
- quickActionsDocsUrl() {
- return this.getNotesData.quickActionsDocs;
+ quickActionsDocsPath() {
+ return this.getNotesData.quickActionsDocsPath;
},
- markdownPreviewUrl() {
+ markdownPreviewPath() {
return this.getIssueData.preview_note_path;
},
author() {
@@ -231,9 +231,9 @@
<div class="flash-container error-alert timeline-content"></div>
<confidentialIssue v-if="isConfidentialIssue" />
<markdown-field
- :markdown-preview-url="markdownPreviewUrl"
- :markdown-docs="markdownDocsUrl"
- :quick-actions-docs="quickActionsDocsUrl"
+ :markdown-preview-path="markdownPreviewPath"
+ :markdown-docs-path="markdownDocsPath"
+ :quick-actions-docs-path="quickActionsDocsPath"
:add-spacing-classes="false"
:is-confidential-issue="isConfidentialIssue">
<textarea
diff --git a/app/assets/javascripts/notes/components/issue_note_form.vue b/app/assets/javascripts/notes/components/issue_note_form.vue
index e0c40f77b00..591008a0285 100644
--- a/app/assets/javascripts/notes/components/issue_note_form.vue
+++ b/app/assets/javascripts/notes/components/issue_note_form.vue
@@ -52,14 +52,14 @@
noteHash() {
return `#note_${this.noteId}`;
},
- markdownPreviewUrl() {
+ markdownPreviewPath() {
return this.getIssueDataByProp('preview_note_path');
},
- markdownDocsUrl() {
- return this.getNotesDataByProp('markdownDocs');
+ markdownDocsPath() {
+ return this.getNotesDataByProp('markdownDocsPath');
},
- quickActionsDocsUrl() {
- return !this.isEditing ? this.getNotesDataByProp('quickActionsDocs') : undefined;
+ quickActionsDocsPath() {
+ return !this.isEditing ? this.getNotesDataByProp('quickActionsDocsPath') : undefined;
},
currentUserId() {
return this.getUserDataByProp('id');
@@ -124,9 +124,9 @@
class="edit-note common-note-form js-quick-submit gfm-form">
<confidentialIssue v-if="isConfidentialIssue" />
<markdown-field
- :markdown-preview-url="markdownPreviewUrl"
- :markdown-docs="markdownDocsUrl"
- :quick-actions-docs="quickActionsDocsUrl"
+ :markdown-preview-path="markdownPreviewPath"
+ :markdown-docs-path="markdownDocsPath"
+ :quick-actions-docs-path="quickActionsDocsPath"
:add-spacing-classes="false">
<textarea
id="note_note"
diff --git a/app/assets/javascripts/notes/index.js b/app/assets/javascripts/notes/index.js
index 7c90cf20019..e2ea37408cf 100644
--- a/app/assets/javascripts/notes/index.js
+++ b/app/assets/javascripts/notes/index.js
@@ -18,8 +18,8 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
newSessionPath: notesDataset.newSessionPath,
registerPath: notesDataset.registerPath,
notesPath: notesDataset.notesPath,
- markdownDocs: notesDataset.markdownDocs,
- quickActionsDocs: notesDataset.quickActionsDocs,
+ markdownDocsPath: notesDataset.markdownDocsPath,
+ quickActionsDocsPath: notesDataset.quickActionsDocsPath,
},
};
},