Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
e0e855b5
Commit
e0e855b5
authored
Jan 09, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix code review suggestions
parent
c0287e69
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
app/assets/javascripts/droplab/droplab_ajax.js
app/assets/javascripts/droplab/droplab_ajax.js
+5
-5
app/assets/javascripts/lib/utils/common_utils.js.es6
app/assets/javascripts/lib/utils/common_utils.js.es6
+2
-0
No files found.
app/assets/javascripts/droplab/droplab_ajax.js
View file @
e0e855b5
...
@@ -3,6 +3,10 @@
...
@@ -3,6 +3,10 @@
/* global droplab */
/* global droplab */
require
(
'
../window
'
)(
function
(
w
){
require
(
'
../window
'
)(
function
(
w
){
function
droplabAjaxException
(
message
)
{
this
.
message
=
message
;
}
w
.
droplabAjax
=
{
w
.
droplabAjax
=
{
_loadUrlData
:
function
_loadUrlData
(
url
)
{
_loadUrlData
:
function
_loadUrlData
(
url
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
...
@@ -56,11 +60,7 @@ require('../window')(function(w){
...
@@ -56,11 +60,7 @@ require('../window')(function(w){
}
}
hook
.
list
[
config
.
method
].
call
(
hook
.
list
,
d
);
hook
.
list
[
config
.
method
].
call
(
hook
.
list
,
d
);
}).
catch
(
function
(
e
)
{
}).
catch
(
function
(
e
)
{
if
(
e
.
message
)
{
throw
new
droplabAjaxException
(
e
.
message
||
e
);
console
.
error
(
e
.
message
,
e
.
stack
);
// eslint-disable-line no-console
}
else
{
console
.
error
(
e
);
// eslint-disable-line no-console
}
});
});
},
},
...
...
app/assets/javascripts/lib/utils/common_utils.js.es6
View file @
e0e855b5
...
@@ -169,6 +169,8 @@
...
@@ -169,6 +169,8 @@
w.gl.utils.getParameterByName = (name) => {
w.gl.utils.getParameterByName = (name) => {
const url = window.location.href;
const url = window.location.href;
name = name.replace(/[[\]]/g, '\\$&');
name = name.replace(/[[\]]/g, '\\$&');
// Finds the value associated to the name
// Example, state=open where state is the name and open is the value
const regex = new RegExp(`[?&]${name}(=([^&#]*)|&|#|$)`);
const regex = new RegExp(`[?&]${name}(=([^&#]*)|&|#|$)`);
const results = regex.exec(url);
const results = regex.exec(url);
if (!results) return null;
if (!results) return null;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment