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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
729562dd
Commit
729562dd
authored
May 01, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rspec prevent default errors
parent
89ab47cd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
7 deletions
+19
-7
app/assets/javascripts/blob/template_selectors/template_selector.js
.../javascripts/blob/template_selectors/template_selector.js
+5
-2
app/assets/javascripts/members.js
app/assets/javascripts/members.js
+4
-1
app/assets/javascripts/namespace_select.js
app/assets/javascripts/namespace_select.js
+2
-1
app/assets/javascripts/project.js
app/assets/javascripts/project.js
+2
-1
app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js
...ts/protected_branches/protected_branch_access_dropdown.js
+4
-1
app/assets/javascripts/protected_branches/protected_branch_dropdown.js
...vascripts/protected_branches/protected_branch_dropdown.js
+2
-1
No files found.
app/assets/javascripts/blob/template_selectors/template_selector.js
View file @
729562dd
...
...
@@ -24,7 +24,7 @@ export default class TemplateSelector {
search
:
{
fields
:
[
'
name
'
],
},
clicked
:
(
item
,
el
,
e
)
=>
this
.
fetchFileTemplate
(
item
,
el
,
e
),
clicked
:
(
options
)
=>
this
.
fetchFileTemplate
(
options
),
text
:
item
=>
item
.
name
,
});
}
...
...
@@ -51,7 +51,10 @@ export default class TemplateSelector {
return
this
.
$dropdownContainer
.
removeClass
(
'
hidden
'
);
}
fetchFileTemplate
(
item
,
el
,
e
)
{
fetchFileTemplate
(
options
)
{
const
{
e
}
=
options
;
const
item
=
options
.
selectedObj
;
e
.
preventDefault
();
return
this
.
requestFile
(
item
);
}
...
...
app/assets/javascripts/members.js
View file @
729562dd
...
...
@@ -43,7 +43,10 @@
return
$el
.
text
();
},
clicked
:
(
selected
,
$link
)
=>
{
clicked
:
(
options
)
=>
{
const
selected
=
options
.
selectedObj
;
const
$link
=
options
.
$el
;
if
(
!
$link
.
data
(
'
revert
'
))
{
this
.
formSubmit
(
null
,
$link
);
}
else
{
...
...
app/assets/javascripts/namespace_select.js
View file @
729562dd
...
...
@@ -58,7 +58,8 @@
});
}
NamespaceSelect
.
prototype
.
onSelectItem
=
function
(
item
,
el
,
e
)
{
NamespaceSelect
.
prototype
.
onSelectItem
=
function
(
options
)
{
const
{
e
}
=
options
;
return
e
.
preventDefault
();
};
...
...
app/assets/javascripts/project.js
View file @
729562dd
...
...
@@ -119,7 +119,8 @@ import Cookies from 'js-cookie';
toggleLabel
:
function
(
obj
,
$el
)
{
return
$el
.
text
().
trim
();
},
clicked
:
function
(
selected
,
$el
,
e
)
{
clicked
:
function
(
options
)
{
const
{
e
}
=
options
;
e
.
preventDefault
();
if
(
$
(
'
input[name="ref"]
'
).
length
)
{
var
$form
=
$dropdown
.
closest
(
'
form
'
);
...
...
app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js
View file @
729562dd
...
...
@@ -53,7 +53,10 @@
onHide
();
}
},
clicked
(
item
,
$el
,
e
)
{
clicked
(
options
)
{
const
{
$el
,
e
}
=
options
;
const
item
=
options
.
selectedObj
;
e
.
preventDefault
();
if
(
$el
.
is
(
'
.is-active
'
))
{
...
...
app/assets/javascripts/protected_branches/protected_branch_dropdown.js
View file @
729562dd
...
...
@@ -35,7 +35,8 @@ class ProtectedBranchDropdown {
return
_
.
escape
(
protectedBranch
.
id
);
},
onFilter
:
this
.
toggleCreateNewButton
.
bind
(
this
),
clicked
:
(
item
,
$el
,
e
)
=>
{
clicked
:
(
options
)
=>
{
const
{
$el
,
e
}
=
options
;
e
.
preventDefault
();
this
.
onSelect
();
}
...
...
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