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
Boxiang Sun
gitlab-ce
Commits
c9ee6a96
Commit
c9ee6a96
authored
Jul 19, 2017
by
kushalpandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert to ES6 class
parent
67107c8f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
146 additions
and
156 deletions
+146
-156
app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js
...ts/protected_branches/protected_branch_access_dropdown.js
+24
-29
app/assets/javascripts/protected_branches/protected_branch_create.js
...javascripts/protected_branches/protected_branch_create.js
+51
-55
app/assets/javascripts/protected_branches/protected_branch_edit.js
...s/javascripts/protected_branches/protected_branch_edit.js
+57
-58
app/assets/javascripts/protected_branches/protected_branch_edit_list.js
...ascripts/protected_branches/protected_branch_edit_list.js
+14
-14
No files found.
app/assets/javascripts/protected_branches/protected_branch_access_dropdown.js
View file @
c9ee6a96
/* eslint-disable arrow-parens, no-param-reassign, object-shorthand, no-else-return, comma-dangle, max-len */
export
default
class
ProtectedBranchAccessDropdown
{
(
global
=>
{
global
.
gl
=
global
.
gl
||
{};
gl
.
ProtectedBranchAccessDropdown
=
class
{
constructor
(
options
)
{
constructor
(
options
)
{
const
{
$dropdown
,
data
,
onSelect
}
=
options
;
this
.
options
=
options
;
this
.
initDropdown
();
}
$dropdown
.
glDropdown
({
initDropdown
()
{
data
:
data
,
const
{
onSelect
}
=
this
.
options
;
this
.
options
.
$dropdown
.
glDropdown
({
data
:
this
.
options
.
data
,
selectable
:
true
,
selectable
:
true
,
inputId
:
$dropdown
.
data
(
'
input-id
'
),
inputId
:
this
.
options
.
$dropdown
.
data
(
'
input-id
'
),
fieldName
:
$dropdown
.
data
(
'
field-name
'
),
fieldName
:
this
.
options
.
$dropdown
.
data
(
'
field-name
'
),
toggleLabel
(
item
,
el
)
{
toggleLabel
(
item
,
$
el
)
{
if
(
el
.
is
(
'
.is-active
'
))
{
if
(
$
el
.
is
(
'
.is-active
'
))
{
return
item
.
text
;
return
item
.
text
;
}
else
{
return
'
Select
'
;
}
}
return
'
Select
'
;
},
},
clicked
(
opts
)
{
clicked
(
options
)
{
const
{
e
}
=
opts
;
options
.
e
.
preventDefault
();
e
.
preventDefault
();
onSelect
();
onSelect
();
}
},
});
});
}
}
};
}
})(
window
);
app/assets/javascripts/protected_branches/protected_branch_create.js
View file @
c9ee6a96
/* eslint-disable no-new, arrow-parens, no-param-reassign, comma-dangle, max-len */
import
ProtectedBranchAccessDropdown
from
'
./protected_branch_access_dropdown
'
;
/* global ProtectedBranchDropdown */
import
ProtectedBranchDropdown
from
'
./protected_branch_dropdown
'
;
(
global
=>
{
export
default
class
ProtectedBranchCreate
{
global
.
gl
=
global
.
gl
||
{};
gl
.
ProtectedBranchCreate
=
class
{
constructor
()
{
constructor
()
{
this
.
$wrap
=
this
.
$form
=
$
(
'
#new_protected_
branch
'
);
this
.
$form
=
$
(
'
.js-new-protected-
branch
'
);
this
.
buildDropdowns
();
this
.
buildDropdowns
();
}
}
buildDropdowns
()
{
buildDropdowns
()
{
const
$allowedToMergeDropdown
=
this
.
$wrap
.
find
(
'
.js-allowed-to-merge
'
);
const
$allowedToMergeDropdown
=
this
.
$form
.
find
(
'
.js-allowed-to-merge
'
);
const
$allowedToPushDropdown
=
this
.
$wrap
.
find
(
'
.js-allowed-to-push
'
);
const
$allowedToPushDropdown
=
this
.
$form
.
find
(
'
.js-allowed-to-push
'
);
// Cache callback
// Cache callback
this
.
onSelectCallback
=
this
.
onSelect
.
bind
(
this
);
this
.
onSelectCallback
=
this
.
onSelect
.
bind
(
this
);
// Allowed to Merge dropdown
// Allowed to Merge dropdown
new
gl
.
ProtectedBranchAccessDropdown
({
this
.
protectedBranchMergeAccessDropdown
=
new
ProtectedBranchAccessDropdown
({
$dropdown
:
$allowedToMergeDropdown
,
$dropdown
:
$allowedToMergeDropdown
,
data
:
gon
.
merge_access_levels
,
data
:
gon
.
merge_access_levels
,
onSelect
:
this
.
onSelectCallback
onSelect
:
this
.
onSelectCallback
,
});
});
// Allowed to Push dropdown
// Allowed to Push dropdown
new
gl
.
ProtectedBranchAccessDropdown
({
this
.
protectedBranchPushAccessDropdown
=
new
ProtectedBranchAccessDropdown
({
$dropdown
:
$allowedToPushDropdown
,
$dropdown
:
$allowedToPushDropdown
,
data
:
gon
.
push_access_levels
,
data
:
gon
.
push_access_levels
,
onSelect
:
this
.
onSelectCallback
onSelect
:
this
.
onSelectCallback
,
});
});
// Select default
// Select default
...
@@ -36,20 +33,19 @@
...
@@ -36,20 +33,19 @@
$allowedToMergeDropdown
.
data
(
'
glDropdown
'
).
selectRowAtIndex
(
0
);
$allowedToMergeDropdown
.
data
(
'
glDropdown
'
).
selectRowAtIndex
(
0
);
// Protected branch dropdown
// Protected branch dropdown
new
ProtectedBranchDropdown
({
this
.
protectedBranchDropdown
=
new
ProtectedBranchDropdown
({
$dropdown
:
this
.
$wrap
.
find
(
'
.js-protected-branch-select
'
),
$dropdown
:
this
.
$form
.
find
(
'
.js-protected-branch-select
'
),
onSelect
:
this
.
onSelectCallback
onSelect
:
this
.
onSelectCallback
,
});
});
}
}
// This will run after clicked callback
// This will run after clicked callback
onSelect
()
{
onSelect
()
{
// Enable submit button
// Enable submit button
const
$branchInput
=
this
.
$wrap
.
find
(
'
input[name="protected_branch[name]"]
'
);
const
$branchInput
=
this
.
$form
.
find
(
'
input[name="protected_branch[name]"]
'
);
const
$allowedToMergeInput
=
this
.
$wrap
.
find
(
'
input[name="protected_branch[merge_access_levels_attributes][0][access_level]"]
'
);
const
$allowedToMergeInput
=
this
.
$form
.
find
(
'
input[name="protected_branch[merge_access_levels_attributes][0][access_level]"]
'
);
const
$allowedToPushInput
=
this
.
$wrap
.
find
(
'
input[name="protected_branch[push_access_levels_attributes][0][access_level]"]
'
);
const
$allowedToPushInput
=
this
.
$form
.
find
(
'
input[name="protected_branch[push_access_levels_attributes][0][access_level]"]
'
);
this
.
$form
.
find
(
'
input[type="submit"]
'
).
attr
(
'
disabled
'
,
!
(
$branchInput
.
val
()
&&
$allowedToMergeInput
.
length
&&
$allowedToPushInput
.
length
));
this
.
$form
.
find
(
'
input[type="submit"]
'
).
attr
(
'
disabled
'
,
!
(
$branchInput
.
val
()
&&
$allowedToMergeInput
.
length
&&
$allowedToPushInput
.
length
));
}
}
};
}
})(
window
);
app/assets/javascripts/protected_branches/protected_branch_edit.js
View file @
c9ee6a96
/* eslint-disable no-new
, arrow-parens, no-param-reassign, comma-dangle, max-len
*/
/* eslint-disable no-new */
/* global Flash */
/* global Flash */
(
global
=>
{
import
ProtectedBranchAccessDropdown
from
'
./protected_branch_access_dropdown
'
;
global
.
gl
=
global
.
gl
||
{};
gl
.
ProtectedBranchEdit
=
class
{
export
default
class
ProtectedBranchEdit
{
constructor
(
options
)
{
constructor
(
options
)
{
this
.
$wrap
=
options
.
$wrap
;
this
.
$wrap
=
options
.
$wrap
;
this
.
$allowedToMergeDropdown
=
this
.
$wrap
.
find
(
'
.js-allowed-to-merge
'
);
this
.
$allowedToMergeDropdown
=
this
.
$wrap
.
find
(
'
.js-allowed-to-merge
'
);
this
.
$allowedToPushDropdown
=
this
.
$wrap
.
find
(
'
.js-allowed-to-push
'
);
this
.
$allowedToPushDropdown
=
this
.
$wrap
.
find
(
'
.js-allowed-to-push
'
);
this
.
onSelectCallback
=
this
.
onSelect
.
bind
(
this
);
this
.
buildDropdowns
();
this
.
buildDropdowns
();
}
}
buildDropdowns
()
{
buildDropdowns
()
{
// Allowed to merge dropdown
// Allowed to merge dropdown
new
gl
.
ProtectedBranchAccessDropdown
({
this
.
protectedBranchAccessDropdown
=
new
ProtectedBranchAccessDropdown
({
$dropdown
:
this
.
$allowedToMergeDropdown
,
$dropdown
:
this
.
$allowedToMergeDropdown
,
data
:
gon
.
merge_access_levels
,
data
:
gon
.
merge_access_levels
,
onSelect
:
this
.
onSelect
.
bind
(
this
)
onSelect
:
this
.
onSelectCallback
,
});
});
// Allowed to push dropdown
// Allowed to push dropdown
new
gl
.
ProtectedBranchAccessDropdown
({
this
.
protectedBranchAccessDropdown
=
new
ProtectedBranchAccessDropdown
({
$dropdown
:
this
.
$allowedToPushDropdown
,
$dropdown
:
this
.
$allowedToPushDropdown
,
data
:
gon
.
push_access_levels
,
data
:
gon
.
push_access_levels
,
onSelect
:
this
.
onSelect
.
bind
(
this
)
onSelect
:
this
.
onSelectCallback
,
});
});
}
}
...
@@ -48,22 +48,21 @@
...
@@ -48,22 +48,21 @@
protected_branch
:
{
protected_branch
:
{
merge_access_levels_attributes
:
[{
merge_access_levels_attributes
:
[{
id
:
this
.
$allowedToMergeDropdown
.
data
(
'
access-level-id
'
),
id
:
this
.
$allowedToMergeDropdown
.
data
(
'
access-level-id
'
),
access_level
:
$allowedToMergeInput
.
val
()
access_level
:
$allowedToMergeInput
.
val
(),
}],
}],
push_access_levels_attributes
:
[{
push_access_levels_attributes
:
[{
id
:
this
.
$allowedToPushDropdown
.
data
(
'
access-level-id
'
),
id
:
this
.
$allowedToPushDropdown
.
data
(
'
access-level-id
'
),
access_level
:
$allowedToPushInput
.
val
()
access_level
:
$allowedToPushInput
.
val
(),
}]
}],
}
},
},
},
error
()
{
error
()
{
$
.
scrollTo
(
0
);
$
.
scrollTo
(
0
);
new
Flash
(
'
Failed to update branch!
'
);
new
Flash
(
'
Failed to update branch!
'
,
null
,
$
(
'
.js-protected-branches-list
'
)
);
}
},
}).
always
(()
=>
{
}).
always
(()
=>
{
this
.
$allowedToMergeDropdown
.
enable
();
this
.
$allowedToMergeDropdown
.
enable
();
this
.
$allowedToPushDropdown
.
enable
();
this
.
$allowedToPushDropdown
.
enable
();
});
});
}
}
};
}
})(
window
);
app/assets/javascripts/protected_branches/protected_branch_edit_list.js
View file @
c9ee6a96
/* eslint-disable
arrow-parens, no-param-reassign, no-new, comma-dangle
*/
/* eslint-disable
no-new
*/
(
global
=>
{
import
ProtectedBranchEdit
from
'
./protected_branch_edit
'
;
global
.
gl
=
global
.
gl
||
{};
gl
.
ProtectedBranchEditList
=
class
{
export
default
class
ProtectedBranchEditList
{
constructor
()
{
constructor
()
{
this
.
$wrap
=
$
(
'
.protected-branches-list
'
);
this
.
$wrap
=
$
(
'
.protected-branches-list
'
);
this
.
initEditForm
();
}
// Build edit forms
initEditForm
()
{
this
.
$wrap
.
find
(
'
.js-protected-branch-edit-form
'
).
each
((
i
,
el
)
=>
{
this
.
$wrap
.
find
(
'
.js-protected-branch-edit-form
'
).
each
((
i
,
el
)
=>
{
new
gl
.
ProtectedBranchEdit
({
new
ProtectedBranchEdit
({
$wrap
:
$
(
el
)
$wrap
:
$
(
el
),
});
});
});
});
}
}
};
}
})(
window
);
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