Merge branch '2.3_branch'

This brings the master branch up to date with the 2.3 release branch
This commit is contained in:
Matt Rogers 2015-08-07 20:27:14 -04:00
commit f393afb69f
27 changed files with 111 additions and 84 deletions

View file

@ -13,9 +13,6 @@ var TracksForm = {
}
toggleLink.parent().toggleClass('hide_form');
},
set_project_name: function (name) {
$('input#todo_project_name').val(name);
},
set_project_name_for_multi_add: function (name) {
$('#multi_todo_project_name').val(name);
},
@ -30,9 +27,8 @@ var TracksForm = {
$('input[name=default_context_name]').val(name);
},
set_project_name_and_default_project_name: function (name) {
TracksForm.set_project_name('');
$('input#todo_project_name').val(name);
$('#default_project_name_id').val(name);
$('#project_name').html(name);
},
set_tag_list_and_default_tag_list: function (name) {
$('input#tag_list').val(name);
@ -658,7 +654,7 @@ var ContextListPage = {
$.post(relative_to_root('contexts/'+context_id), {
'context[name]': value,
'_method': 'put'
}, highlight);
}, highlight, 'script');
return value;
},
setup_behavior: function() {