summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-03-28 11:18:53 +0200
committerTim Zallmann <tzallmann@gitlab.com>2018-03-28 12:17:30 +0200
commit8b72bcfae0d7880c5951c066c68f8180e49e7bca (patch)
tree349dd829d873dee5ee22695798f65052cc7570f6
parent8f7cf2ede5ef37d8c333aef7962de0191492f7c1 (diff)
downloadgitlab-ce-8b72bcfae0d7880c5951c066c68f8180e49e7bca.tar.gz
Added Utility Function for WebIDE URL
-rw-r--r--app/assets/javascripts/lib/utils/url_utility.js12
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue3
2 files changed, 13 insertions, 2 deletions
diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js
index a266bb6771f..9761225892a 100644
--- a/app/assets/javascripts/lib/utils/url_utility.js
+++ b/app/assets/javascripts/lib/utils/url_utility.js
@@ -1,3 +1,5 @@
+import project from '../../ide/stores/mutations/project';
+
// Returns an array containing the value(s) of the
// of the key passed as an argument
export function getParameterValues(sParam) {
@@ -51,7 +53,7 @@ export function removeParams(params) {
const url = document.createElement('a');
url.href = window.location.href;
- params.forEach((param) => {
+ params.forEach(param => {
url.search = removeParamQueryString(url.search, param);
});
@@ -83,3 +85,11 @@ export function refreshCurrentPage() {
export function redirectTo(url) {
return window.location.assign(url);
}
+
+export function webIDEUrl(projectUrl = undefined) {
+ let returnUrl = `${gon.relative_url_root}/-/ide/`;
+ if (projectUrl) {
+ returnUrl += `project${projectUrl}`;
+ }
+ return returnUrl;
+}
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
index e8cdce0e1dd..18ee4c62bf1 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
@@ -1,6 +1,7 @@
<script>
import tooltip from '~/vue_shared/directives/tooltip';
import { n__ } from '~/locale';
+import { webIDEUrl } from '~/lib/utils/url_utility';
import icon from '~/vue_shared/components/icon.vue';
import clipboardButton from '~/vue_shared/components/clipboard_button.vue';
@@ -42,7 +43,7 @@ export default {
return this.isBranchTitleLong(this.mr.targetBranch);
},
webIdePath() {
- return `${gon.relative_url_root}/-/ide/project${this.mr.statusPath.replace('.json', '')}`;
+ return webIDEUrl(this.mr.statusPath.replace('.json', ''));
},
},
methods: {