@@ -1,3 +1,5 @@ +v0.8.14. Removed use of all Rails JS helpers, this fixes an issue when jrails is used in the app (Thanks, Chris Zelenak) + v0.8.12. Added some inline branding. v0.8.11. Signup and login for the TuneUp hosted service is now only required if the user wants to share a run (privately or publicly). CHANGELOG @@ -1,3 +1,5 @@ +* 2008-09-03: Chris Zelenak; pointed us in the right direction: a bug with tuneup + jrails + * 2008-07-21: Bryan Liles; merged fallback log dir code from git://github.com/bryanl/fiveruns_tuneup.git (master:e5838f47f) * 2008-06-14: Howard Rauscher; merged javascript sandboxing code from git://github.com/howardr/fiveruns_tuneup.git (master:8cc558dbe) \ No newline at end of file CONTRIBUTORS @@ -75,7 +75,7 @@ module Fiveruns MAJOR = 0 MINOR = 8 - TINY = 13 + TINY = 14 # The current version as a Version instance CURRENT = new(MAJOR, MINOR, TINY) lib/fiveruns/tuneup/version.rb @@ -31,9 +31,9 @@ class TuneupController < ActionController::Base end def register - render(:update) do |p| - p['tuneup-panel'].hide - p.insert_html(:bottom, 'tuneup-content', :partial => 'tuneup/panel/register.html.erb') + render :update do |page| + page << "$('tuneup-panel').hide();" + page << %[new Insertion.Bottom('tuneup-content', "#{escape_javascript(render(:partial => 'tuneup/panel/register.html.erb'))}");] end end @@ -45,7 +45,7 @@ class TuneupController < ActionController::Base end render :update do |page| if api_key - page.replace('tuneup-save-link', link_to_upload) + page << "$('tuneup-save-link').replace('#{escape_javascript(link_to_upload)}');" page << redisplay_last_run(false) else page << tuneup_show_flash(:error, @@ -103,7 +103,9 @@ class TuneupController < ActionController::Base def collect(state) Fiveruns::Tuneup.collecting = state - render(:update) { |p| p['tuneup-panel'].replace(render(:partial => 'tuneup/panel/show.html.erb')) } + render :update do |page| + page << %[$('tuneup-panel').update("#{escape_javascript(render(:partial => 'tuneup/panel/show.html.erb'))}")] + end end def find_config lib/tuneup_controller.rb @@ -172,8 +172,8 @@ module TuneupHelper #:nodoc: def tuneup_reload_panel update_page do |page| - page['tuneup-flash'].removeClassName('tuneup-show'); - page['tuneup-content'].replace_html(render(:partial => "tuneup/panel/show.html.erb")) + page << "$('tuneup-flash').removeClassName('tuneup-show');" + page << %[$('tuneup-content').update("#{escape_javascript(render(:partial => 'tuneup/panel/show.html.erb'))}");] page << 'TuneUp.adjustAbsoluteElements(_document.body);' page << 'TuneUp.adjustFixedElements();' end @@ -182,12 +182,12 @@ module TuneupHelper #:nodoc: def tuneup_show_flash(type, locals) types = [:error, :notice].reject { |t| t == type } update_page do |page| - page['tuneup-flash'].replace_html(render(:partial => 'flash.html.erb', :locals => locals.merge(:type => type))) - page['tuneup-flash'].addClassName('tuneup-show'); + page << %[$('tuneup-flash').update("#{escape_javascript(render(:partial => 'flash.html.erb', :locals => locals.merge(:type => type)))}");] + page << "$('tuneup-flash').addClassName('tuneup-show')" types.each do |other_type| - page['tuneup-flash'].removeClassName("tuneup-#{other_type}") + page << "$('tuneup-flash').removeClassName('tuneup-#{other_type}')" end - page['tuneup-flash'].addClassName("tuneup-#{type}"); + page << "$('tuneup-flash').addClassName('tuneup-#{type}')" page << 'TuneUp.adjustAbsoluteElements(_document.body);' page << 'TuneUp.adjustFixedElements();' end lib/tuneup_helper.rb 21c8e6844a72dbe8f50bee92953aa52523ecafd6 Eric Falcao efalcao@gmail.com http://github.com/fiveruns/fiveruns_tuneup/commit/5715182f2c6b48fa7b0558f334011361c2826be0 5715182f2c6b48fa7b0558f334011361c2826be0 2008-09-03T10:37:42-07:00 2008-09-03T10:37:42-07:00 removed use of rails js helpers to prevent issues with jrails. thank you Chris Zelenak 5278ac52982f4783a6c82d3bd7a297b3905a3500 Eric Falcao efalcao@gmail.com