Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-20 07:56:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/helpers/todos_helper.rb
	app/views/shared/_footer.html.erb
This commit is contained in:
Reinier Balt 2014-06-26 10:46:20 +02:00
commit 59291f305f
170 changed files with 629 additions and 882 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/application.js
View file

@ -12,9 +12,7 @@
//
//= require jquery
//= require jquery_ujs
//
//= require bootstrap
//
//= require mousetrap
//
// Stuff in vendor/assets
@ -32,4 +30,5 @@
//
// Stuff in app/assets
//= require tracks.js
//= require keybindings.js
//= require disable_fx_in_test
//= require keybindings.js

3
app/assets/javascripts/disable_fx_in_test.js.erb Normal file
View file

@ -0,0 +1,3 @@
<% if Rails.env.test? || Rails.env.cucumber? %>
$.fx.off = true;
<% end %>

4
app/assets/javascripts/tracks.old.js
View file

@ -588,7 +588,7 @@ var TodoItems = {
$(document).on("click",'.item-container a.delete_dependency_button', function(evt){
var predecessor_id=$(this).attr("x_predecessors_id");
var ajax_options = default_ajax_options_for_scripts('DELETE', this.href, $(this).parents('.item-container'));
ajax_options.data << {predecessor: predecessor_id}
ajax_options.data["predecessor"] = predecessor_id
$.ajax(ajax_options);
return false;
});
@ -1245,7 +1245,7 @@ function setup_periodic_check(url_for_check, interval_in_sec, method) {
function(){
var settings = default_ajax_options_for_scripts( method ? method : "GET", url_for_check, null);
if(typeof(AUTH_TOKEN) != 'undefined'){
settings.data << {authenticity_token: AUTH_TOKEN}
settings.data["authenticity_token"] = AUTH_TOKEN
}
$.ajax(settings);
},