Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-14 11:24:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix failing tests

Browse source
This commit is contained in:
Reinier Balt 2011-02-03 22:44:26 +01:00
parent 463757a338
commit 514045e8cb
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/feedlist_controller.rb
View file

@ -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

2
app/controllers/notes_controller.rb
View file

@ -49,7 +49,7 @@ class NotesController < ApplicationController
@saved = @note.save
respond_to do |format|
format.html
format.js
format.js { render }
end
end

2
app/views/layouts/login.html.erb
View file

@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<%= stylesheet_link_tag "scaffold" %>
<%= javascript_include_tag 'jquery-1.4.4.min', 'jquery.cookie' %>
<%= javascript_include_tag 'jquery-1.5.min', 'jquery.cookie' %>
<title><%= @page_title -%></title>

4
app/views/layouts/standard.html.erb
View file

@ -2,9 +2,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<%= 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' %>

6
public/javascripts/application.js
View file

@ -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')
});