Author: rhari
Date: Fri May 4 10:58:49 2007
New Revision: 408
URL: http://svn.gna.org/viewcvs/phplinker?rev=408&view=rev
Log:
#210
Bug fix
Modified:
trunk/www/js/drag-drop-folder-tree.js
Modified: trunk/www/js/drag-drop-folder-tree.js
URL:
http://svn.gna.org/viewcvs/phplinker/trunk/www/js/drag-drop-folder-tree.js?rev=408&r1=407&r2=408&view=diff
==============================================================================
--- trunk/www/js/drag-drop-folder-tree.js (original)
+++ trunk/www/js/drag-drop-folder-tree.js Fri May 4 10:58:49 2007
@@ -627,7 +627,7 @@
JSTreeObj.dragNode_parent.appendChild(JSTreeObj.dragNode_source);
}
- if (JSTreeObj.dragNode_destination.id != 'root'){
+ if (JSTreeObj.dragNode_destination &&
JSTreeObj.dragNode_destination.id != 'root'){
// Modification de l'id_ad_tag de la catégorie
destination
JSTreeObj.dragNode_destination.setAttribute('id_ad_tag',
JSTreeObj.dragNode_source.id.substring(4));
JSTreeObj.dragNode_destination.setAttribute('Modified', 'true');
@@ -649,7 +649,7 @@
// Si le tag est droppé dans le root, juste
modifier ces enfants
else{
- if
(JSTreeObj.hasSubNodes(JSTreeObj.dragNode_destination) && confirm("Cette action
sera récursive?"))
+ if (JSTreeObj.dragNode_destination &&
JSTreeObj.hasSubNodes(JSTreeObj.dragNode_destination) && confirm("Cette action
sera récursive?"))
JSTreeObj.setTag(JSTreeObj.dragNode_destination,
JSTreeObj.dragNode_source.id.substring(4));
}
}
@@ -787,23 +787,37 @@
,
__deleteItem_step2 : function(obj)
{
-
+ var istag = 'false';
var saveString = obj.id.replace(/[^0-9]/gi,'');
+ if (obj.getAttribute('is_tag') == 'true')
+ istag = 'true';
var lis = obj.getElementsByTagName('LI');
for(var no=0;no<lis.length;no++){
- saveString = saveString + ',' +
lis[no].id.replace(/[^0-9]/gi,'');
+ if (lis[no].getAttribute('is_tag') == 'true')
+ istag = 'true';
+
+ saveString = saveString + ',' +
lis[no].id.replace(/[^0-9]/gi,'');
}
// Creating ajax object and send items
var ajaxIndex = JSTreeObj.ajaxObjects.length;
JSTreeObj.ajaxObjects[ajaxIndex] = new sack();
JSTreeObj.ajaxObjects[ajaxIndex].method = "GET";
- //***************************hari 20070427
- if (deleteIds == "")
- deleteIds = saveString;
- else
- deleteIds = deleteIds + "," + saveString;
+ //***************************hari 20070427***modif
20070504
+ if (istag == 'false'){
+ if (deleteIds == ""){
+ deleteIds = saveString;
+ }else{
+ deleteIds = deleteIds + "," + saveString;
+ }
+ }else{
+ if (deleteTagIds == ""){
+ deleteTagIds = saveString;
+ }else{
+ deleteTagIds = deleteTagIds + "," + saveString;
+ }
+ }
//************************************************
JSTreeObj.ajaxObjects[ajaxIndex].setVar("deleteIds",
saveString);
JSTreeObj.__addAdditionalRequestParameters(JSTreeObj.ajaxObjects[ajaxIndex],
JSTreeObj.additionalDeleteRequestParameters);
@@ -1007,8 +1021,8 @@
if(this.renameAllowed)menuModel.addItem(2,'Rename','','',false,'JSTreeObj.renameItem');
//*****************************Hari
20070418***lastmodif 20070418*************/
-
menuModel.addItem(5,'Show','','',false,'JSTreeObj.showItem'); // function
showItem is don't more created
-
menuModel.addItem(6,'Hide','','',false,'JSTreeObj.hideItem'); // function
showItem is don't more created
+
menuModel.addItem(5,'Show','','',false,'JSTreeObj.showItem');
+
menuModel.addItem(6,'Hide','','',false,'JSTreeObj.hideItem');
//****************************************************************************/
menuModel.init();
@@ -1020,6 +1034,14 @@
var menuModelDeleteOnly = new
DHTMLGoodies_menuModel();
if(this.deleteAllowed)menuModelDeleteOnly.addItem(4,'Delete','','',false,'JSTreeObj.deleteItem');
menuModelDeleteOnly.init();
+
+ //***********************hari
20070504***
+ var menuModelForTag = new
DHTMLGoodies_menuModel();
+
menuModelForTag.addItem(3,'Rename','','',false,'JSTreeObj.renameItem');
+
menuModelForTag.addItem(4,'Delete','','',false,'JSTreeObj.deleteItem');
+
+ menuModelForTag.init();
+
//***************************************
window.refToDragDropTree = this;
@@ -1093,17 +1115,20 @@
menuItems[no].insertBefore(folderImg,aTag);
if(this.contextMenu){
+ var isTag =
menuItems[no].getAttribute('is_tag');
var noDelete =
menuItems[no].getAttribute('noDelete');
if(!noDelete)noDelete =
menuItems[no].noDelete;
var noRename =
menuItems[no].getAttribute('noRename');
if(!noRename)noRename =
menuItems[no].noRename;
-
- if(noRename=='true' &&
noDelete=='true'){}else{
+ if (isTag == 'true')
+
this.contextMenu.attachToElement(aTag,false,menuModelForTag);
+ else
+ if(noRename=='true' &&
noDelete=='true'){}else{
if(noDelete ==
'true')this.contextMenu.attachToElement(aTag,false,menuModelRenameOnly);
else if(noRename ==
'true')this.contextMenu.attachToElement(aTag,false,menuModelDeleteOnly);
else
this.contextMenu.attachToElement(aTag,false,menuModel);
- }
+ }
}
this.addEvent(aTag,'contextmenu',this.highlightItem);
_______________________________________________
PHPLinker-commits mailing list
[email protected]
https://mail.gna.org/listinfo/phplinker-commits
