diff --git a/app/controllers/feedlist_controller.rb b/app/controllers/feedlist_controller.rb
index ffaa02ab..16d1ddc7 100644
--- a/app/controllers/feedlist_controller.rb
+++ b/app/controllers/feedlist_controller.rb
@@ -28,7 +28,7 @@ class FeedlistController < ApplicationController
def get_feeds_for_context
@context = current_user.contexts.find params[:context_id]
respond_to do |format|
- format.html { render :text => "This page should not be called directly"}
+ format.html { render :file => 'feedlist/get_feeds_for_context'}
format.js
end
end
@@ -36,7 +36,7 @@ class FeedlistController < ApplicationController
def get_feeds_for_project
@project = current_user.projects.find params[:project_id]
respond_to do |format|
- format.html { render :text => "This page should not be called directly"}
+ format.html { render :file => "feedlist/get_feeds_for_project"}
format.js
end
end
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 7bd97a89..4081611a 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -49,7 +49,7 @@ class NotesController < ApplicationController
@saved = @note.save
respond_to do |format|
format.html
- format.js
+ format.js { render }
end
end
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index a7a1af0e..9e4da310 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -3,7 +3,7 @@
<%= stylesheet_link_tag "scaffold" %>
- <%= javascript_include_tag 'jquery-1.4.4.min', 'jquery.cookie' %>
+ <%= javascript_include_tag 'jquery-1.5.min', 'jquery.cookie' %>
<%= @page_title -%>
diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb
index a097ac03..64b322d3 100644
--- a/app/views/layouts/standard.html.erb
+++ b/app/views/layouts/standard.html.erb
@@ -2,9 +2,9 @@
- <%= stylesheet_link_tag 'standard','superfish','niftyCorners', 'jquery-ui-1.8.7.custom', :cache => true %>
+ <%= stylesheet_link_tag 'standard','superfish','niftyCorners', 'jquery-ui-1.8.9.custom', :cache => true %>
<%= stylesheet_link_tag "print", :media => "print" %>
- <%= javascript_include_tag 'jquery-1.4.4.min', 'jquery-ui-1.8.7.custom.min', 'jquery.truncator',
+ <%= javascript_include_tag 'jquery-1.5.min', 'jquery-ui-1.8.9.custom.min', 'jquery.truncator',
'jquery.jeditable.mini', 'jquery.cookie', 'jquery.blockUI', 'jquery.form', :cache => 'jquery-all' %>
<%= javascript_include_tag 'hoverIntent','superfish','application',
'accesskey-hints','niftycube','swfobject', :cache => 'tracks' %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 3f55dc26..e373002a 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -803,7 +803,9 @@ function default_ajax_options_for_scripts(ajax_type, the_url, element_to_block)
}
function submit_with_ajax_and_block_element(form, element_to_block) {
- $(form).ajaxSubmit(default_ajax_options_for_submit('POST', element_to_block));
+ options = default_ajax_options_for_submit('POST', element_to_block);
+ options.dataType = 'script';
+ $(form).ajaxSubmit(options);
}
function get_with_ajax_and_block_element(the_url, element_to_block) {
@@ -915,7 +917,7 @@ function enable_rich_interaction(){
$('input[name=project_name]').autocomplete({
source: relative_to_root('projects.autocomplete')
});
- $('input[name=project[default_context_name]]').autocomplete({
+ $('input[name="project[default_context_name]"]').autocomplete({
source: relative_to_root('contexts.autocomplete')
});