summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-06-19 23:03:01 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-06-19 23:03:01 +0000
commit14074da8b1806f62b32a264cf01a8b055fee3ea7 (patch)
tree98453884bb058ac2d3f1a03a978a812c493a90a6
parent44851d079f569a6318f3c642a0adcf8486dd3947 (diff)
downloadredmine-14074da8b1806f62b32a264cf01a8b055fee3ea7.tar.gz
redmine-14074da8b1806f62b32a264cf01a8b055fee3ea7.zip
Merged r3784 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3793 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/members_controller.rb8
-rw-r--r--public/javascripts/application.js9
2 files changed, 16 insertions, 1 deletions
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 3bfa606e1..2a12cee0c 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -38,6 +38,7 @@ class MembersController < ApplicationController
format.js {
render(:update) {|page|
page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+ page << 'hideOnLoad()'
members.each {|member| page.visual_effect(:highlight, "member-#{member.id}") }
}
}
@@ -51,6 +52,7 @@ class MembersController < ApplicationController
format.js {
render(:update) {|page|
page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+ page << 'hideOnLoad()'
page.visual_effect(:highlight, "member-#{@member.id}")
}
}
@@ -64,7 +66,11 @@ class MembersController < ApplicationController
end
respond_to do |format|
format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
- format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
+ format.js { render(:update) {|page|
+ page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+ page << 'hideOnLoad()'
+ }
+ }
end
end
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 57419d0b0..472f75830 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -207,3 +207,12 @@ Ajax.Responders.register({
}
}
});
+
+function hideOnLoad() {
+ $$('.hol').each(function(el) {
+ el.hide();
+ });
+}
+
+Event.observe(window, 'load', hideOnLoad);
+