extract param helper to pagination dir

3 files changed, 18 insertions, 23 deletions

diff --git a/app/assets/javascripts/vue_pagination/index.js.es6 b/app/assets/javascripts/vue_pagination/index.js.es6
index ed2357b5d9e..f0f0b54dd2b 100644
--- a/app/assets/javascripts/vue_pagination/index.js.es6
+++ b/app/assets/javascripts/vue_pagination/index.js.es6
@@ -1,6 +1,8 @@
 /* global Vue, gl */
 /* eslint-disable no-param-reassign, no-plusplus */
 
+//= require ./param_helper.js.es6
+
 ((gl) => {
   const PAGINATION_UI_BUTTON_LIMIT = 4;
   const SPREAD = '...';
@@ -9,16 +11,6 @@
   const FIRST = '<< First';
   const LAST = 'Last >>';
 
-  const getParameterByName = (name) => {
-    const url = window.location.href;
-    name = name.replace(/[[\]]/g, '\\$&');
-    const regex = new RegExp(`[?&]${name}(=([^&#]*)|&|#|$)`);
-    const results = regex.exec(url);
-    if (!results) return null;
-    if (!results[2]) return '';
-    return decodeURIComponent(results[2].replace(/\+/g, ' '));
-  };
-
   gl.VueGlPagination = Vue.extend({
     props: [
       'change',
@@ -27,7 +19,7 @@
     methods: {
       changepage(e) {
         let pagenum = this.pageInfo.page;
-        let apiScope = getParameterByName('scope');
+        let apiScope = gl.getParameterByName('scope');
 
         if (!apiScope) apiScope = 'all';
 
diff --git a/app/assets/javascripts/vue_pagination/param_helper.js.es6 b/app/assets/javascripts/vue_pagination/param_helper.js.es6
new file mode 100644
index 00000000000..4c684f96e9e
--- /dev/null
+++ b/app/assets/javascripts/vue_pagination/param_helper.js.es6
@@ -0,0 +1,13 @@
+/* eslint-disable no-param-reassign */
+
+((w) => {
+  w.getParameterByName = (name) => {
+    const url = window.location.href;
+    name = name.replace(/[[\]]/g, '\\$&');
+    const regex = new RegExp(`[?&]${name}(=([^&#]*)|&|#|$)`);
+    const results = regex.exec(url);
+    if (!results) return null;
+    if (!results[2]) return '';
+    return decodeURIComponent(results[2].replace(/\+/g, ' '));
+  };
+})(window.gl || (window.gl = {}));
diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
index ac889bb2d9f..2fdcaf3e16c 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
@@ -2,16 +2,6 @@
 /* eslint-disable no-param-reassign, no-bitwise*/
 
 ((gl) => {
-  const getParameterByName = (name) => {
-    const url = window.location.href;
-    name = name.replace(/[[\]]/g, '\\$&');
-    const regex = new RegExp(`[?&]${name}(=([^&#]*)|&|#|$)`);
-    const results = regex.exec(url);
-    if (!results) return null;
-    if (!results[2]) return '';
-    return decodeURIComponent(results[2].replace(/\+/g, ' '));
-  };
-
   gl.VuePipelines = Vue.extend({
     components: {
       runningPipeline: gl.VueRunningPipeline,
@@ -38,8 +28,8 @@
     },
     props: ['scope', 'store'],
     created() {
-      const pagenum = getParameterByName('p');
-      const scope = getParameterByName('scope');
+      const pagenum = gl.getParameterByName('p');
+      const scope = gl.getParameterByName('scope');
       if (pagenum) this.pagenum = pagenum;
       if (scope) this.apiScope = scope;
       this.store.fetchDataLoop.call(this, Vue, this.pagenum, this.scope, this.apiScope);