commit 8523ea770bb4ea1c4c7ae8df5de62b49e0a79026
parent 0ad70799a8f9791c22242de1beecb651ecbd5408
Author: Jan Dankert <devnull@localhost>
Date: Tue, 4 Sep 2018 23:11:55 +0200
Fix: Aus dem Baum die korrekte Action aufrufen.
Diffstat:
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/cms-ui/themes/default/script/plugin/jquery-plugin-orTree.js b/modules/cms-ui/themes/default/script/plugin/jquery-plugin-orTree.js
@@ -45,7 +45,7 @@ jQuery.fn.orTree = function( options )
if ( !line.action || line.action=='folder' || settings.selectable.length==0 || settings.selectable[0]=='' || jQuery.inArray(line.action, settings.selectable)!=-1 )
{
//var img = (line.url!==undefined?'tree_plus':'tree_none');
- var new_li = $('<li class="object" data-id="'+line.internalId+'" data-type="'+line.type+'"><div class="tree"><div class="arrow"></div></div><a href="./?action='+line.type+'&id='+line.internalId+'" class="entry" data-extra="'+JSON.stringify(line.extraId).replace(/"/g, "'")+'" data-id="'+line.internalId+'" data-type="'+line.type+'" title="'+ line.description + '"><img src="modules/cms-ui/themes/default/images/icon_'+line['icon']+'.png" />'+ line.text + '</a></li>');
+ var new_li = $('<li class="object" data-id="'+line.internalId+'" data-type="'+line.type+'"><div class="tree"><div class="arrow"></div></div><a href="./?action='+line.action+'&id='+line.internalId+'" class="entry" data-extra="'+JSON.stringify(line.extraId).replace(/"/g, "'")+'" data-id="'+line.internalId+'" data-type="'+line.type+'" title="'+ line.description + '"><img src="modules/cms-ui/themes/default/images/icon_'+line['icon']+'.png" />'+ line.text + '</a></li>');
$(ul).append( new_li );
//var new_li = $(ul).children('li').last();
//$(new_li).children('div').unbind('click');
diff --git a/modules/cms-ui/themes/default/script/plugin/jquery-plugin-orTree.min.js b/modules/cms-ui/themes/default/script/plugin/jquery-plugin-orTree.min.js
@@ -1,3 +1,3 @@
;jQuery.fn.orTree=function(t){var e=$.extend({'onSelect':function(){},'type':'root','id':0,'extraId':Array(),'selectable':Array()},t);$(this).each(function(r,t){$(t).closest('div.content').addClass('loader');var i='./api/?action=tree&subaction=loadBranch&id='+e.id+'&type='+e.type+'&output=json';if(typeof e.extraId==='string'){jQuery.each(jQuery.parseJSON(e.extraId),function(e,t){i=i+'&'+e+'='+t})}
else if(typeof e.extraId==='object'){jQuery.each(e.extraId,function(e,t){i=i+'&'+e+'='+t})}
-else{};$.getJSON(i,function(a){$(t).append('<ul class="tree"/>');var r=$(t).children('ul').first(),i=a['output'];$.each(i['branch'],function(a,t){if(!t.action||t.action=='folder'||e.selectable.length==0||e.selectable[0]==''||jQuery.inArray(t.action,e.selectable)!=-1){var i=$('<li class="object" data-id="'+t.internalId+'" data-type="'+t.type+'"><div class="tree"><div class="arrow"></div></div><a href="./?action='+t.type+'&id='+t.internalId+'" class="entry" data-extra="'+JSON.stringify(t.extraId).replace(/"/g,'\'')+'" data-id="'+t.internalId+'" data-type="'+t.type+'" title="'+t.description+'"><img src="modules/cms-ui/themes/default/images/icon_'+t['icon']+'.png" />'+t.text+'</a></li>');$(r).append(i);if(t.type){$(i).children('div.tree').addClass('closed').find('.arrow').addClass('arrow-right');$(i).children('div.tree').click(function(){$(this).parent().orTree({type:t.type,id:t.internalId,extraId:t.extraId,onSelect:e.onSelect,selectable:e.selectable})})};if(t.action&&(e.selectable.length==0||e.selectable[0]==''||jQuery.inArray(t.action,e.selectable)!=-1)){$(i).children('.entry').click(function(a){a.preventDefault();$(this).closest('div.content').find('.entry').removeClass('selected');$(this).addClass('selected');e.onSelect($(this).text(),t.action,t.id,t.extraId)})};if($(i).parents('ul.tree').length<=1){$(i).children('div.tree').click()}}});$(r).slideDown('fast')}).fail(function(){}).always(function(){$(t).closest('div.content').removeClass('loader')});$(t).children('div.tree').unbind('click');$(t).children('div.tree').removeClass('closed').addClass('open').find('.arrow').removeClass('arrow-right').addClass('arrow-down');$(t).children('div.tree').click(function(t){a($(t.delegateTarget).parent(),e.type,e.id,e.extraId)})});function a(t,a,r,i){$(t).children('ul').slideUp('fast',function(){$(t).children('ul').remove();$(t).children('div.tree').unbind('click');$(t).children('div.tree').removeClass('open').addClass('closed').find('.arrow').removeClass('arrow-down').addClass('arrow arrow-right');$(t).children('div.tree').click(function(){$(this).parent().orTree({type:a,id:r,extraId:i,onSelect:e.onSelect,selectable:e.selectable})})})}};-
\ No newline at end of file
+else{};$.getJSON(i,function(a){$(t).append('<ul class="tree"/>');var r=$(t).children('ul').first(),i=a['output'];$.each(i['branch'],function(a,t){if(!t.action||t.action=='folder'||e.selectable.length==0||e.selectable[0]==''||jQuery.inArray(t.action,e.selectable)!=-1){var i=$('<li class="object" data-id="'+t.internalId+'" data-type="'+t.type+'"><div class="tree"><div class="arrow"></div></div><a href="./?action='+t.action+'&id='+t.internalId+'" class="entry" data-extra="'+JSON.stringify(t.extraId).replace(/"/g,'\'')+'" data-id="'+t.internalId+'" data-type="'+t.type+'" title="'+t.description+'"><img src="modules/cms-ui/themes/default/images/icon_'+t['icon']+'.png" />'+t.text+'</a></li>');$(r).append(i);if(t.type){$(i).children('div.tree').addClass('closed').find('.arrow').addClass('arrow-right');$(i).children('div.tree').click(function(){$(this).parent().orTree({type:t.type,id:t.internalId,extraId:t.extraId,onSelect:e.onSelect,selectable:e.selectable})})};if(t.action&&(e.selectable.length==0||e.selectable[0]==''||jQuery.inArray(t.action,e.selectable)!=-1)){$(i).children('.entry').click(function(a){a.preventDefault();$(this).closest('div.content').find('.entry').removeClass('selected');$(this).addClass('selected');e.onSelect($(this).text(),t.action,t.id,t.extraId)})};if($(i).parents('ul.tree').length<=1){$(i).children('div.tree').click()}}});$(r).slideDown('fast')}).fail(function(){}).always(function(){$(t).closest('div.content').removeClass('loader')});$(t).children('div.tree').unbind('click');$(t).children('div.tree').removeClass('closed').addClass('open').find('.arrow').removeClass('arrow-right').addClass('arrow-down');$(t).children('div.tree').click(function(t){a($(t.delegateTarget).parent(),e.type,e.id,e.extraId)})});function a(t,a,r,i){$(t).children('ul').slideUp('fast',function(){$(t).children('ul').remove();$(t).children('div.tree').unbind('click');$(t).children('div.tree').removeClass('open').addClass('closed').find('.arrow').removeClass('arrow-down').addClass('arrow arrow-right');$(t).children('div.tree').click(function(){$(this).parent().orTree({type:a,id:r,extraId:i,onSelect:e.onSelect,selectable:e.selectable})})})}};+
\ No newline at end of file
