summaryrefslogtreecommitdiff
path: root/app/views/notes
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2011-10-26 18:46:25 +0500
committerNihad Abbasov <narkoz.2008@gmail.com>2011-10-26 18:46:25 +0500
commitd62200cad430565bd9f80befaf329297120330b5 (patch)
tree6217dd41e6f86e657513b509ed7a3f2bfdfa70ab /app/views/notes
parentf6a67fbad5119e3d95e33cfd4f4e4992707d5ba0 (diff)
downloadgitlab-ce-d62200cad430565bd9f80befaf329297120330b5.tar.gz
clean-up code
* Remove trailing whitespace * Converts hard-tabs into two-space soft-tabs * Remove consecutive blank lines
Diffstat (limited to 'app/views/notes')
-rw-r--r--app/views/notes/_form.html.haml2
-rw-r--r--app/views/notes/_notes.html.haml11
-rw-r--r--app/views/notes/create.js.haml2
3 files changed, 7 insertions, 8 deletions
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index ca56a2450a0..14e74fa694f 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -22,7 +22,7 @@
= check_box_tag :notify, 1, true
= label_tag :notify, "Notify project team about your note"
-
+
.clear
%br
= f.submit 'Add note', :class => "lbutton vm", :id => "submit_note"
diff --git a/app/views/notes/_notes.html.haml b/app/views/notes/_notes.html.haml
index 2d110162eca..e7cc2360758 100644
--- a/app/views/notes/_notes.html.haml
+++ b/app/views/notes/_notes.html.haml
@@ -1,7 +1,7 @@
- if controller.action_name == "wall"
%ul#notes-list= render "notes/notes_list"
-- else
+- else
%ul#notes-list= render "notes/notes_list"
%br
%br
@@ -9,17 +9,16 @@
= render "notes/form"
:javascript
- $('.delete-note').live('ajax:success', function() {
- $(this).closest('li').fadeOut(); });
+ $('.delete-note').live('ajax:success', function() {
+ $(this).closest('li').fadeOut(); });
$("#new_note").live("ajax:before", function(){
- $("#submit_note").attr("disabled", "disabled");
+ $("#submit_note").attr("disabled", "disabled");
})
$("#new_note").live("ajax:complete", function(){
- $("#submit_note").removeAttr("disabled");
+ $("#submit_note").removeAttr("disabled");
})
-
- if ["issues", "projects"].include?(controller.controller_name)
:javascript
diff --git a/app/views/notes/create.js.haml b/app/views/notes/create.js.haml
index 15371dbce2b..a04130e8a75 100644
--- a/app/views/notes/create.js.haml
+++ b/app/views/notes/create.js.haml
@@ -7,5 +7,5 @@
:plain
$("#new_note").replaceWith("#{escape_javascript(render('form'))}");
-:plain
+:plain
$("#submit_note").removeAttr("disabled");