Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 15:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2055 from scriptythekid/master

Browse source 
make drag&drop todos from/to contexts work again  - fix #2054
This commit is contained in:
Jyri-Petteri Paloposki 2019-05-22 22:46:51 +03:00 • committed by GitHub
commit dad7fdf006
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/tracks.js.erb
View file

@ -648,7 +648,7 @@ var ContextListPage = {
} }
}, },
save_context_name: function(value, settings) { save_context_name: function(value, settings) {
var context_id = $(this).parents('.container.context').get(0).id.split('c')[1]; var context_id = $(this).parents('.container.context').get(0).id.split('_')[1];
var highlight = function(){ var highlight = function(){
$('div.context span#context_name').effect('highlight', {}, 500); $('div.context span#context_name').effect('highlight', {}, 500);
}; };

1
app/helpers/todos_helper.rb
View file

@ -120,6 +120,7 @@ module TodosHelper
toggle = settings[:collapsible] ? container_toggle("toggle_#{settings[:id]}") : "" toggle = settings[:collapsible] ? container_toggle("toggle_#{settings[:id]}") : ""
"#{toggle} #{settings[:title]} #{settings[:append_descriptor]}".html_safe "#{toggle} #{settings[:title]} #{settings[:append_descriptor]}".html_safe
end end
header += content_tag(:div, nil, :id => settings[:id] + "_target", :class => "context_target drop_target")
header.html_safe header.html_safe
end end

2
app/views/contexts/_context.html.erb
View file

@ -8,7 +8,7 @@ cache [context, source_view_key, current_user.date.strftime("%Y%m%d"), @tag_name
render :partial => 'todos/collection', render :partial => 'todos/collection',
:object => @not_done, :object => @not_done,
:locals => { :settings => { :locals => { :settings => {
:id => "c#{context.id}", :id => "context_#{context.id}",
:collapsible => settings[:collapsible], :collapsible => settings[:collapsible],
:container_name => 'context', :container_name => 'context',
:title => show_context_name(context), :title => show_context_name(context),