Author: jablko
Date: Tue Oct 6 11:05:21 2009
New Revision: 3676
Log:
Cosmetic changes, arrange function braces according to coding standard,
http://qubit-toolkit.org/wiki/index.php?title=Coding_standard -- force
Modified:
trunk/web/js/treeView.js
Modified: trunk/web/js/treeView.js
==============================================================================
--- trunk/web/js/treeView.js Tue Oct 6 09:19:00 2009 (r3675)
+++ trunk/web/js/treeView.js Tue Oct 6 11:05:21 2009 (r3676)
@@ -3,10 +3,12 @@
Qubit.treeView = Qubit.treeView || {};
Drupal.behaviors.treeView = {
+
attach: function (context)
{
// Build tree function
- function build(objects, expands, parentId, parentNode) {
+ function build(objects, expands, parentId, parentNode)
+ {
while (objects.length > 0 && objects[0].parentId == parentId)
{
var object = objects.shift();
@@ -20,79 +22,86 @@
dd.invalidHandleTypes = {};
- dd.onDragDrop = function (event, id) {
+ dd.onDragDrop = function (event, id)
+ {
var newParent = parentNode.tree.getNodeByElement($('#' +
id)[0]);
jQuery.ajax({
+
data: { parent: newParent.qubit_id },
type: 'POST',
- url:
textNode.href.replace(/\/(informationobject|term)\/\D*(\d+)/, '/$1/move/$2')});
+ url:
textNode.href.replace(/\/(informationobject|term)\/\D*(\d+)/, '/$1/move/$2') });
parentNode.tree.popNode(textNode);
- textNode.appendTo(newParent);
-
parentNode.refresh();
+
+ textNode.appendTo(newParent);
newParent.refresh();
};
- dd.endDrag = function () { };
+ dd.endDrag = function ()
+ {
+ };
}
build(objects, expands, object.id, textNode);
}
}
- function loadNodeData(node, fnLoadComplete) {
+ function loadNodeData(node, fnLoadComplete)
+ {
var nodeId = node.data.id;
if (Qubit.treeView.expands[nodeId])
{
- fnLoadComplete();
- return;
+ return fnLoadComplete();
}
- $.ajax
- ({
- type: "GET",
- url: Qubit.treeView.Url,
- data: { "id": nodeId },
- dataType: "json",
- error: function() { fnLoadComplete(); },
- success: function(data) {
- for (var i = 0; i < data.length; i++)
- {
- var tmp = new YAHOO.widget.TextNode(data[i], node, false);
- tmp.isLeaf = data[i].isLeaf;
-
- if (Qubit.treeView.draggable && !tmp.parent.isRoot())
- {
- var dd = new YAHOO.util.DD(tmp.labelElId);
-
- dd.invalidHandleTypes = {};
-
- dd.onDragDrop = function (event, id) {
- var newParent = node.tree.getNodeByElement($('#' + id)[0]);
+ jQuery.ajax({
- jQuery.ajax({
- data: { parent: newParent.qubit_id },
- type: 'POST',
- url:
tmp.href.replace(/\/(informationobject|term)\/\D*(\d+)/, '/$1/move/$2')});
+ data: { id: nodeId },
+ timeout: 7000,
+ url: Qubit.treeView.Url,
- node.tree.popNode(tmp);
- tmp.appendTo(newParent);
+ error: fnLoadComplete,
- node.refresh();
- tmp.parent.refresh();
- };
+ success: function (data)
+ {
+ for (var i = 0; i < data.length; i++)
+ {
+ var tmp = new YAHOO.widget.TextNode(data[i], node, false);
+ tmp.isLeaf = data[i].isLeaf;
- dd.endDrag = function () { };
+ if (Qubit.treeView.draggable && !tmp.parent.isRoot())
+ {
+ var dd = new YAHOO.util.DD(tmp.labelElId);
+
+ dd.invalidHandleTypes = {};
+
+ dd.onDragDrop = function (event, id)
+ {
+ var newParent = node.tree.getNodeByElement($('#' +
id)[0]);
+
+ jQuery.ajax({
+ data: { parent: newParent.qubit_id },
+ type: 'POST',
+ url:
tmp.href.replace(/\/(informationobject|term)\/\D*(\d+)/, '/$1/move/$2') });
+
+ node.tree.popNode(tmp);
+ node.refresh();
+
+ tmp.appendTo(newParent);
+ newParent.refresh();
+ };
+
+ dd.endDrag = function ()
+ {
+ };
+ }
}
- }
- fnLoadComplete();
- },
- timeout: 7000
- });
+ return fnLoadComplete();
+ } });
}
// Create a new tree
@@ -105,6 +114,5 @@
build(Qubit.treeView.objects, Qubit.treeView.expands,
Qubit.treeView.objects[0].parentId, Qubit.treeView.treeView.getRoot());
// Render tree
- Qubit.treeView.treeView.draw();
-
+ Qubit.treeView.treeView.render();
} };
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
