Refactor js behaviours helpers

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

9 files changed, 155 insertions, 147 deletions

diff --git a/app/assets/javascripts/behaviors/details_behavior.coffee b/app/assets/javascripts/behaviors/details_behavior.coffee
index 7ad5c818946..decab3e1bed 100644
--- a/app/assets/javascripts/behaviors/details_behavior.coffee
+++ b/app/assets/javascripts/behaviors/details_behavior.coffee
@@ -1,5 +1,15 @@
 $ ->
   $("body").on "click", ".js-details-target", ->
     container = $(@).closest(".js-details-container")
-
     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()
diff --git a/app/assets/javascripts/behaviors/toggler_behavior.coffee b/app/assets/javascripts/behaviors/toggler_behavior.coffee
index 5afb656e696..d06cb116dfe 100644
--- a/app/assets/javascripts/behaviors/toggler_behavior.coffee
+++ b/app/assets/javascripts/behaviors/toggler_behavior.coffee
@@ -1,17 +1,18 @@
 $ ->
   $("body").on "click", ".js-toggler-target", ->
     container = $(@).closest(".js-toggler-container")
-
     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').
       toggleClass('icon-chevron-down').
       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()
     e.preventDefault()
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
index 69c731ff1a1..70e8972d24d 100644
--- a/app/assets/javascripts/main.js.coffee
+++ b/app/assets/javascripts/main.js.coffee
@@ -62,11 +62,6 @@ $ ->
   $('.remove-row').bind 'ajax:success', ->
     $(this).closest('li').fadeOut()
 
-  # Click a .appear-link, appear-data fadeout
-  $(".appear-link").on 'click', (e) ->
-    $('.appear-data').fadeIn()
-    e.preventDefault()
-
   # Initialize select2 selects
   $('select.select2').select2(width: 'resolve', dropdownAutoWidth: true)
 
@@ -121,10 +116,6 @@ $ ->
     $(@).next('table').show()
     $(@).remove()
 
-  $(".diff-content").on "click", ".js-details-expand", ->
-    $(@).next('.js-details-contain').removeClass("hide")
-    $(@).remove()
-
 (($) ->
   # Disable an element and add the 'disabled' Bootstrap class
   $.fn.extend disable: ->
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 6183cefa594..b5ccaed0401 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -298,10 +298,6 @@ img.emoji {
   width: 20px;
 }
 
-.appear-data {
-  display: none;
-}
-
 .chart {
   overflow: hidden;
   height: 220px;
diff --git a/app/views/groups/members.html.haml b/app/views/groups/members.html.haml
index 0c972622f88..2d0605b18ad 100644
--- a/app/views/groups/members.html.haml
+++ b/app/views/groups/members.html.haml
@@ -9,7 +9,7 @@
 
 %hr
 
-.clearfix
+.clearfix.js-toggle-container
   = form_tag members_group_path(@group), method: :get, class: 'form-inline member-search-form'  do
     .form-group
       = search_field_tag :search, params[:search], { placeholder: 'Find member by name', class: 'form-control search-text-input input-mn-300' }
@@ -17,11 +17,11 @@
 
   - if current_user && current_user.can?(:manage_group, @group)
     .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
         %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"
 
 .ui-box.prepend-top-20
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index df44c30c005..e61d9a2ac47 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -47,7 +47,7 @@
       - if @branches.any?
         and in
         = link_to("#{pluralize(@branches.count, "other branch")}", "#", class: "js-details-expand")
-        %span.js-details-contain.hide
+        %span.js-details-content.hide
           = commit_branches_links(@project, @branches)
 
 .commit-box
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 005d994806e..10674ccae46 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -93,100 +93,101 @@
 
 
 
-    .centered-light-block
-      %h3
-        %i.icon-warning-sign
-        Dangerous settings
-
-      %p Project settings below may result in data loss!
-      = link_to '#', class: 'btn js-toggle-visibility-link' do
-        Show it to me
-        %i.icon-chevron-down
-
-    .js-toggle-visibility-container.hide
-      - if can? current_user, :archive_project, @project
-        .ui-box.ui-box-danger
-          .title
-            - if @project.archived?
-              Unarchive project
-            - else
-              Archive project
-          .body
-            - if @project.archived?
-              %p
-                Unarchiving the project will mark its repository as active.
-                %br
-                The project can be committed to.
-                %br
-                %strong Once active this project shows up in the search and on the dashboard.
-              = link_to 'Unarchive', unarchive_project_path(@project),
-                  data: { confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be comitted to again." },
-                  method: :post, class: "btn btn-remove"
-            - else
-              %p
-                Archiving the project will mark its repository as read-only.
-                %br
-                It is hidden from the dashboard and doesn't show up in searches.
-                %br
-                %strong Archived projects cannot be committed to!
-              = link_to 'Archive', archive_project_path(@project),
-                  data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
-                  method: :post, class: "btn btn-remove"
-      - else
-        .nothing-here-block Only the project owner can archive a project
-
-      - if can?(current_user, :change_namespace, @project)
+    .danger-settings.js-toggle-container
+      .centered-light-block
+        %h3
+          %i.icon-warning-sign
+          Dangerous settings
+
+        %p Project settings below may result in data loss!
+        = link_to '#', class: 'btn js-toggle-button' do
+          Show it to me
+          %i.icon-chevron-down
+
+      .js-toggle-content.hide
+        - if can? current_user, :archive_project, @project
+          .ui-box.ui-box-danger
+            .title
+              - if @project.archived?
+                Unarchive project
+              - else
+                Archive project
+            .body
+              - if @project.archived?
+                %p
+                  Unarchiving the project will mark its repository as active.
+                  %br
+                  The project can be committed to.
+                  %br
+                  %strong Once active this project shows up in the search and on the dashboard.
+                = link_to 'Unarchive', unarchive_project_path(@project),
+                    data: { confirm: "Are you sure that you want to unarchive this project?\nWhen this project is unarchived it is active and can be comitted to again." },
+                    method: :post, class: "btn btn-remove"
+              - else
+                %p
+                  Archiving the project will mark its repository as read-only.
+                  %br
+                  It is hidden from the dashboard and doesn't show up in searches.
+                  %br
+                  %strong Archived projects cannot be committed to!
+                = link_to 'Archive', archive_project_path(@project),
+                    data: { confirm: "Are you sure that you want to archive this project?\nAn archived project cannot be committed to." },
+                    method: :post, class: "btn btn-remove"
+        - else
+          .nothing-here-block Only the project owner can archive a project
+
+        - if can?(current_user, :change_namespace, @project)
+          .ui-box.ui-box-danger
+            .title Transfer project
+            .errors-holder
+            .form-holder
+              = form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f|
+                .form-group
+                  = f.label :namespace_id, class: 'control-label' do
+                    %span Namespace
+                  .col-sm-10
+                    .form-group
+                      = f.select :namespace_id, namespaces_options(@project.namespace_id), { prompt: 'Choose a project namespace' }, { class: 'select2' }
+                    %ul
+                      %li Be careful. Changing the project's namespace can have unintended side effects.
+                      %li You can only transfer the project to namespaces you manage.
+                      %li You will need to update your local repositories to point to the new location.
+                .form-actions
+                  = f.submit 'Transfer', class: "btn btn-remove"
+        - else
+          .nothing-here-block Only the project owner can transfer a project
+
         .ui-box.ui-box-danger
-          .title Transfer project
+          .title Rename repository
           .errors-holder
           .form-holder
-            = form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f|
+            = form_for(@project, html: { class: 'form-horizontal' }) do |f|
               .form-group
-                = f.label :namespace_id, class: 'control-label' do
-                  %span Namespace
-                .col-sm-10
+                = f.label :path, class: 'control-label' do
+                  %span Path
+                .col-sm-9
                   .form-group
-                    = f.select :namespace_id, namespaces_options(@project.namespace_id), { prompt: 'Choose a project namespace' }, { class: 'select2' }
+                    .input-group
+                      = f.text_field :path, class: 'form-control'
+                      %span.input-group-addon .git
                   %ul
-                    %li Be careful. Changing the project's namespace can have unintended side effects.
-                    %li You can only transfer the project to namespaces you manage.
+                    %li Be careful. Renaming a project's repository can have unintended side effects.
                     %li You will need to update your local repositories to point to the new location.
               .form-actions
-                = f.submit 'Transfer', class: "btn btn-remove"
-      - else
-        .nothing-here-block Only the project owner can transfer a project
-
-      .ui-box.ui-box-danger
-        .title Rename repository
-        .errors-holder
-        .form-holder
-          = form_for(@project, html: { class: 'form-horizontal' }) do |f|
-            .form-group
-              = f.label :path, class: 'control-label' do
-                %span Path
-              .col-sm-9
-                .form-group
-                  .input-group
-                    = f.text_field :path, class: 'form-control'
-                    %span.input-group-addon .git
-                %ul
-                  %li Be careful. Renaming a project's repository can have unintended side effects.
-                  %li You will need to update your local repositories to point to the new location.
-            .form-actions
-              = f.submit 'Rename', class: "btn btn-remove"
-
-      - if can?(current_user, :remove_project, @project)
-        .ui-box.ui-box-danger
-          .title Remove project
-          .body
-            %p
-              Removing the project will delete its repository and all related resources including issues, merge requests etc.
-              %br
-              %strong Removed projects cannot be restored!
-
-            = link_to 'Remove project', @project, data: { confirm: remove_project_message(@project) }, method: :delete, class: "btn btn-remove"
-      - else
-        .nothing-here-block Only project owner can remove a project
+                = f.submit 'Rename', class: "btn btn-remove"
+
+        - if can?(current_user, :remove_project, @project)
+          .ui-box.ui-box-danger
+            .title Remove project
+            .body
+              %p
+                Removing the project will delete its repository and all related resources including issues, merge requests etc.
+                %br
+                %strong Removed projects cannot be restored!
+
+              = link_to 'Remove project', @project, data: { confirm: remove_project_message(@project) }, method: :delete, class: "btn btn-remove"
+        - else
+          .nothing-here-block Only project owner can remove a project
 
 .save-project-loader.hide
   %center
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index a9cbe43fb16..97706a5a4b0 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -15,18 +15,19 @@
             = link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
           for instructions.
 
-          %br
-          If you want to modify merge commit message -
-          %strong
-            = link_to "click here", "#", class: "modify-merge-commit-link js-toggle-visibility-link", title: "Modify merge commit message"
 
-        .js-toggle-visibility-container.hide
-          .form-group
-            = label_tag :merge_commit_message, "Commit message", class: 'control-label'
-            .col-sm-10
-              = text_area_tag :merge_commit_message, @merge_request.merge_commit_message, class: "form-control js-gfm-input", rows: 14, required: true
-              %p.hint
-                The recommended maximum line length is 52 characters for the first line and 72 characters for all following lines.
+        .js-toggle-container
+          %p
+            If you want to modify merge commit message -
+            %strong
+              = link_to "click here", "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message"
+          .js-toggle-content.hide
+            .form-group
+              = label_tag :merge_commit_message, "Commit message", class: 'control-label'
+              .col-sm-10
+                = text_area_tag :merge_commit_message, @merge_request.merge_commit_message, class: "form-control js-gfm-input", rows: 14, required: true
+                %p.hint
+                  The recommended maximum line length is 52 characters for the first line and 72 characters for all following lines.
 
         .accept-group
           .pull-left
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 9ee54fef062..9cc28c7f535 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -9,18 +9,6 @@
           %strong Project name
         .col-sm-10
           = 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?
         .form-group
@@ -29,19 +17,39 @@
           .col-sm-10
             = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'select2', tabindex: 2}
 
-      .form-group
-        .col-sm-2
-        .col-sm-10
-          = link_to "#", class: 'appear-link' do
-            %i.icon-upload-alt
-            %span Import existing repository?
-      .form-group.appear-data.import-url-data
-        = f.label :import_url, class: 'control-label' do
-          %span Import existing repo
-        .col-sm-10
-          = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
-          .light
-            URL must be cloneable
+      %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
+          .col-sm-2
+          .col-sm-10
+            = link_to "#", class: 'js-toggle-button' do
+              %i.icon-upload-alt
+              %span Import existing repository?
+        .js-toggle-content.hide
+          .form-group.import-url-data
+            = f.label :import_url, class: 'control-label' do
+              %span Import existing repo
+            .col-sm-10
+              = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
+              .light
+                URL must be cloneable
+      %hr
+
       .form-group
         = f.label :description, class: 'control-label' do
           Description