From dae670bd693cbfc19cbef1258d228534cfd0ad7e Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Wed, 1 Oct 2014 17:30:40 +0200
Subject: Search for 'div-dropzone' correctly

---
 app/assets/javascripts/markdown_area.js.coffee          | 2 +-
 app/views/projects/issues/_form.html.haml               | 2 +-
 app/views/projects/merge_requests/_form.html.haml       | 2 +-
 app/views/projects/merge_requests/_new_submit.html.haml | 2 +-
 app/views/projects/milestones/_form.html.haml           | 2 +-
 app/views/projects/notes/_form.html.haml                | 2 +-
 app/views/projects/wikis/_form.html.haml                | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/markdown_area.js.coffee b/app/assets/javascripts/markdown_area.js.coffee
index c698cc4be8d..fca7b5bc030 100644
--- a/app/assets/javascripts/markdown_area.js.coffee
+++ b/app/assets/javascripts/markdown_area.js.coffee
@@ -190,7 +190,7 @@ $(document).ready ->
 
   $(".markdown-selector").click (e) ->
     e.preventDefault()
-    $(@).closest(".note-write-holder").find(".div-dropzone").click()
+    $(@).closest('.gfm-form').find('.div-dropzone').click()
     return
 
   return
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index a4a6b0005c7..6016c02b7f5 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -8,7 +8,7 @@
         .alert.alert-info
           = "Please review the <strong>#{link_to "guidelines for contribution", contribution_guide_url}</strong> to this repository.".html_safe
 
-  = form_for [@project, @issue], html: { class: 'form-horizontal issue-form' } do |f|
+  = form_for [@project, @issue], html: { class: 'form-horizontal issue-form gfm-form' } do |f|
     = render 'projects/issuable_form', f: f, issuable: @issue
     .form-group
       = f.label :label_ids, class: 'control-label' do
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 154a01f59ad..015d47eabf7 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project, @merge_request], html: { class: "merge-request-form form-horizontal" } do |f|
+= form_for [@project, @merge_request], html: { class: 'merge-request-form form-horizontal gfm-form' } do |f|
   .merge-request-form-info
     = render 'projects/issuable_form', f: f, issuable: @merge_request
     .form-group
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index 84bf81441b1..9c51c40d32c 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -9,7 +9,7 @@
   %span.pull-right
     = link_to 'Change branches', new_project_merge_request_path(@project)
 
-= form_for [@project, @merge_request], html: { class: "merge-request-form" } do |f|
+= form_for [@project, @merge_request], html: { class: "merge-request-form gfm-form" } do |f|
   .panel.panel-default
 
     .panel-body
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index df79125eae6..27069802d5a 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -5,7 +5,7 @@
 
 %hr
 
-= form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"}  do |f|
+= form_for [@project, @milestone], html: {class: "new_milestone form-horizontal gfm-form"}  do |f|
   -if @milestone.errors.any?
     .alert.alert-danger
       %ul
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml
index 65d7f081545..52d6719a2ed 100644
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project, @note], remote: true, html: { :'data-type' => 'json', multipart: true, id: nil, class: "new_note js-new-note-form common-note-form" }, authenticity_token: true do |f|
+= form_for [@project, @note], remote: true, html: { :'data-type' => 'json', multipart: true, id: nil, class: "new_note js-new-note-form common-note-form gfm-form" }, authenticity_token: true do |f|
   = note_target_fields
   = f.hidden_field :commit_id
   = f.hidden_field :line_code
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 0a24e36ae84..1e39e4dd774 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -1,4 +1,4 @@
-= form_for [@project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal' } do |f|
+= form_for [@project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal gfm-form' } do |f|
   -if @page.errors.any?
     #error_explanation
       .alert.alert-danger
-- 
cgit v1.2.1