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
Kazuhiko Shiozaki
gitlab-ce
Commits
7157f79c
Commit
7157f79c
authored
Mar 11, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor js behaviours helpers
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
9f405068
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
155 additions
and
147 deletions
+155
-147
app/assets/javascripts/behaviors/details_behavior.coffee
app/assets/javascripts/behaviors/details_behavior.coffee
+11
-1
app/assets/javascripts/behaviors/toggler_behavior.coffee
app/assets/javascripts/behaviors/toggler_behavior.coffee
+8
-7
app/assets/javascripts/main.js.coffee
app/assets/javascripts/main.js.coffee
+0
-9
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+0
-4
app/views/groups/members.html.haml
app/views/groups/members.html.haml
+3
-3
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+1
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+87
-86
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+12
-11
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+33
-25
No files found.
app/assets/javascripts/behaviors/details_behavior.coffee
View file @
7157f79c
$
->
$
->
$
(
"body"
).
on
"click"
,
".js-details-target"
,
->
$
(
"body"
).
on
"click"
,
".js-details-target"
,
->
container
=
$
(
@
).
closest
(
".js-details-container"
)
container
=
$
(
@
).
closest
(
".js-details-container"
)
container
.
toggleClass
(
"open"
)
container
.
toggleClass
(
"open"
)
# Show details content. Hides link after click.
#
# %div
# %a.js-details-expand
# %div.js-details-content
#
$
(
"body"
).
on
"click"
,
".js-details-expand"
,
(
e
)
->
$
(
@
).
next
(
'.js-details-content'
).
removeClass
(
"hide"
)
$
(
@
).
hide
()
e
.
preventDefault
()
app/assets/javascripts/behaviors/toggler_behavior.coffee
View file @
7157f79c
$
->
$
->
$
(
"body"
).
on
"click"
,
".js-toggler-target"
,
->
$
(
"body"
).
on
"click"
,
".js-toggler-target"
,
->
container
=
$
(
@
).
closest
(
".js-toggler-container"
)
container
=
$
(
@
).
closest
(
".js-toggler-container"
)
container
.
toggleClass
(
"on"
)
container
.
toggleClass
(
"on"
)
$
(
"body"
).
on
"click"
,
".js-toggle-visibility-link"
,
(
e
)
->
# Toggle button. Show/hide content inside parent container.
# Button does not change visibility. If button has icon - it changes chevron style.
#
# %div.js-toggle-container
# %a.js-toggle-button
# %div.js-toggle-content
#
$
(
"body"
).
on
"click"
,
".js-toggle-button"
,
(
e
)
->
$
(
@
).
find
(
'i'
).
$
(
@
).
find
(
'i'
).
toggleClass
(
'icon-chevron-down'
).
toggleClass
(
'icon-chevron-down'
).
toggleClass
(
'icon-chevron-up'
)
toggleClass
(
'icon-chevron-up'
)
container
=
$
(
".js-toggle-visibility-container"
)
container
.
toggleClass
(
"hide"
)
e
.
preventDefault
()
$
(
"body"
).
on
"click"
,
".js-toggle-button"
,
(
e
)
->
$
(
@
).
closest
(
".js-toggle-container"
).
find
(
".js-toggle-content"
).
toggle
()
$
(
@
).
closest
(
".js-toggle-container"
).
find
(
".js-toggle-content"
).
toggle
()
e
.
preventDefault
()
e
.
preventDefault
()
app/assets/javascripts/main.js.coffee
View file @
7157f79c
...
@@ -62,11 +62,6 @@ $ ->
...
@@ -62,11 +62,6 @@ $ ->
$
(
'.remove-row'
).
bind
'ajax:success'
,
->
$
(
'.remove-row'
).
bind
'ajax:success'
,
->
$
(
this
).
closest
(
'li'
).
fadeOut
()
$
(
this
).
closest
(
'li'
).
fadeOut
()
# Click a .appear-link, appear-data fadeout
$
(
".appear-link"
).
on
'click'
,
(
e
)
->
$
(
'.appear-data'
).
fadeIn
()
e
.
preventDefault
()
# Initialize select2 selects
# Initialize select2 selects
$
(
'select.select2'
).
select2
(
width
:
'resolve'
,
dropdownAutoWidth
:
true
)
$
(
'select.select2'
).
select2
(
width
:
'resolve'
,
dropdownAutoWidth
:
true
)
...
@@ -121,10 +116,6 @@ $ ->
...
@@ -121,10 +116,6 @@ $ ->
$
(
@
).
next
(
'table'
).
show
()
$
(
@
).
next
(
'table'
).
show
()
$
(
@
).
remove
()
$
(
@
).
remove
()
$
(
".diff-content"
).
on
"click"
,
".js-details-expand"
,
->
$
(
@
).
next
(
'.js-details-contain'
).
removeClass
(
"hide"
)
$
(
@
).
remove
()
((
$
)
->
((
$
)
->
# Disable an element and add the 'disabled' Bootstrap class
# Disable an element and add the 'disabled' Bootstrap class
$
.
fn
.
extend
disable
:
->
$
.
fn
.
extend
disable
:
->
...
...
app/assets/stylesheets/generic/common.scss
View file @
7157f79c
...
@@ -298,10 +298,6 @@ img.emoji {
...
@@ -298,10 +298,6 @@ img.emoji {
width
:
20px
;
width
:
20px
;
}
}
.appear-data
{
display
:
none
;
}
.chart
{
.chart
{
overflow
:
hidden
;
overflow
:
hidden
;
height
:
220px
;
height
:
220px
;
...
...
app/views/groups/members.html.haml
View file @
7157f79c
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
%hr
%hr
.clearfix
.clearfix
.js-toggle-container
=
form_tag
members_group_path
(
@group
),
method: :get
,
class:
'form-inline member-search-form'
do
=
form_tag
members_group_path
(
@group
),
method: :get
,
class:
'form-inline member-search-form'
do
.form-group
.form-group
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find member by name'
,
class:
'form-control search-text-input input-mn-300'
}
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find member by name'
,
class:
'form-control search-text-input input-mn-300'
}
...
@@ -17,11 +17,11 @@
...
@@ -17,11 +17,11 @@
-
if
current_user
&&
current_user
.
can?
(
:manage_group
,
@group
)
-
if
current_user
&&
current_user
.
can?
(
:manage_group
,
@group
)
.pull-right
.pull-right
=
link_to
'#'
,
class:
'btn btn-new js-toggle-
visibility-link
'
do
=
link_to
'#'
,
class:
'btn btn-new js-toggle-
button
'
do
Add members
Add members
%i
.icon-chevron-down
%i
.icon-chevron-down
.js-toggle-
visibility-container
.hide.new-group-member-holder
.js-toggle-
content
.hide.new-group-member-holder
=
render
"new_group_member"
=
render
"new_group_member"
.ui-box.prepend-top-20
.ui-box.prepend-top-20
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
7157f79c
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
-
if
@branches
.
any?
-
if
@branches
.
any?
and in
and in
=
link_to
(
"
#{
pluralize
(
@branches
.
count
,
"other branch"
)
}
"
,
"#"
,
class:
"js-details-expand"
)
=
link_to
(
"
#{
pluralize
(
@branches
.
count
,
"other branch"
)
}
"
,
"#"
,
class:
"js-details-expand"
)
%span
.js-details-cont
ain
.hide
%span
.js-details-cont
ent
.hide
=
commit_branches_links
(
@project
,
@branches
)
=
commit_branches_links
(
@project
,
@branches
)
.commit-box
.commit-box
...
...
app/views/projects/edit.html.haml
View file @
7157f79c
...
@@ -93,17 +93,18 @@
...
@@ -93,17 +93,18 @@
.danger-settings.js-toggle-container
.centered-light-block
.centered-light-block
%h3
%h3
%i
.icon-warning-sign
%i
.icon-warning-sign
Dangerous settings
Dangerous settings
%p
Project settings below may result in data loss!
%p
Project settings below may result in data loss!
=
link_to
'#'
,
class:
'btn js-toggle-visibility-link
'
do
=
link_to
'#'
,
class:
'btn js-toggle-button
'
do
Show it to me
Show it to me
%i
.icon-chevron-down
%i
.icon-chevron-down
.js-toggle-visibility-container
.hide
.js-toggle-content
.hide
-
if
can?
current_user
,
:archive_project
,
@project
-
if
can?
current_user
,
:archive_project
,
@project
.ui-box.ui-box-danger
.ui-box.ui-box-danger
.title
.title
...
...
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
7157f79c
...
@@ -15,12 +15,13 @@
...
@@ -15,12 +15,13 @@
=
link_to
"click here"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
link_to
"click here"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
for instructions.
for instructions.
%br
.js-toggle-container
%p
If you want to modify merge commit message -
If you want to modify merge commit message -
%strong
%strong
=
link_to
"click here"
,
"#"
,
class:
"modify-merge-commit-link js-toggle-visibility-link"
,
title:
"Modify merge commit message"
=
link_to
"click here"
,
"#"
,
class:
"modify-merge-commit-link js-toggle-button"
,
title:
"Modify merge commit message"
.js-toggle-content.hide
.js-toggle-visibility-container.hide
.form-group
.form-group
=
label_tag
:merge_commit_message
,
"Commit message"
,
class:
'control-label'
=
label_tag
:merge_commit_message
,
"Commit message"
,
class:
'control-label'
.col-sm-10
.col-sm-10
...
...
app/views/projects/new.html.haml
View file @
7157f79c
...
@@ -9,18 +9,6 @@
...
@@ -9,18 +9,6 @@
%strong
Project name
%strong
Project name
.col-sm-10
.col-sm-10
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"form-control"
,
tabindex:
1
,
autofocus:
true
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"form-control"
,
tabindex:
1
,
autofocus:
true
.help-inline
=
link_to
"#"
,
class:
'js-toggle-visibility-link'
do
%span
Customize repository name?
.form-group.js-toggle-visibility-container.hide
=
f
.
label
:path
,
class:
'control-label'
do
%span
Repository name
.col-sm-10
.input-group
=
f
.
text_field
:path
,
class:
'form-control'
%span
.input-group-addon
.git
-
if
current_user
.
can_select_namespace?
-
if
current_user
.
can_select_namespace?
.form-group
.form-group
...
@@ -29,19 +17,39 @@
...
@@ -29,19 +17,39 @@
.col-sm-10
.col-sm-10
=
f
.
select
:namespace_id
,
namespaces_options
(
params
[
:namespace_id
]
||
:current_user
),
{},
{
class:
'select2'
,
tabindex:
2
}
=
f
.
select
:namespace_id
,
namespaces_options
(
params
[
:namespace_id
]
||
:current_user
),
{},
{
class:
'select2'
,
tabindex:
2
}
%hr
.js-toggle-container
.form-group
.col-sm-2
.col-sm-10
=
link_to
"#"
,
class:
'js-toggle-button'
do
%span
Customize repository name?
.js-toggle-content.hide
.form-group
=
f
.
label
:path
,
class:
'control-label'
do
%span
Repository name
.col-sm-10
.input-group
=
f
.
text_field
:path
,
class:
'form-control'
%span
.input-group-addon
.git
.js-toggle-container
.form-group
.form-group
.col-sm-2
.col-sm-2
.col-sm-10
.col-sm-10
=
link_to
"#"
,
class:
'appear-link
'
do
=
link_to
"#"
,
class:
'js-toggle-button
'
do
%i
.icon-upload-alt
%i
.icon-upload-alt
%span
Import existing repository?
%span
Import existing repository?
.form-group.appear-data.import-url-data
.js-toggle-content.hide
.form-group.import-url-data
=
f
.
label
:import_url
,
class:
'control-label'
do
=
f
.
label
:import_url
,
class:
'control-label'
do
%span
Import existing repo
%span
Import existing repo
.col-sm-10
.col-sm-10
=
f
.
text_field
:import_url
,
class:
'form-control'
,
placeholder:
'https://github.com/randx/six.git'
=
f
.
text_field
:import_url
,
class:
'form-control'
,
placeholder:
'https://github.com/randx/six.git'
.light
.light
URL must be cloneable
URL must be cloneable
%hr
.form-group
.form-group
=
f
.
label
:description
,
class:
'control-label'
do
=
f
.
label
:description
,
class:
'control-label'
do
Description
Description
...
...
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