Skip to content
This repository has been archived by the owner on Dec 21, 2021. It is now read-only.

Commit

Permalink
AUI-1402 - Build
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Mak committed Jul 2, 2014
1 parent d462aa1 commit 9d5951a
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 42 deletions.
1 change: 0 additions & 1 deletion build/aui-tree/aui-tree-data-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,6 @@ A.mix(TreeData.prototype, {
// and then set the children, to have the appendChild propagation
// the PARENT_NODE references should be updated
var length = children.push(node);
instance.set(CHILDREN, children);

// updating prev/nextSibling attributes
var prevIndex = length - 2;
Expand Down
2 changes: 1 addition & 1 deletion build/aui-tree/aui-tree-data-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion build/aui-tree/aui-tree-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,6 @@ A.mix(TreeData.prototype, {
// and then set the children, to have the appendChild propagation
// the PARENT_NODE references should be updated
var length = children.push(node);
instance.set(CHILDREN, children);

// updating prev/nextSibling attributes
var prevIndex = length - 2;
Expand Down
20 changes: 11 additions & 9 deletions build/aui-tree/aui-tree-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,6 @@ A.mix(TreeData.prototype, {
// and then set the children, to have the appendChild propagation
// the PARENT_NODE references should be updated
var length = children.push(node);
instance.set(CHILDREN, children);

// updating prev/nextSibling attributes
var prevIndex = length - 2;
Expand Down Expand Up @@ -2988,12 +2987,10 @@ var TreeView = A.Component.create(
ownerTree: instance
});

if (deepContainer) {
// render node before invoke the recursion
treeNode.render();

// propagating markup recursion
instance._createFromHTMLMarkup(deepContainer);
if (instance.get('lazyLoad')) {
A.setTimeout(function() {
treeNode.render();
}, 50);
}
else {
treeNode.render();
Expand All @@ -3009,6 +3006,11 @@ var TreeView = A.Component.create(

// and simulate the appendChild.
parentInstance.appendChild(treeNode);

if (deepContainer) {
// propgating markup recursion
instance._createFromHTMLMarkup(deepContainer);
}
});
},

Expand Down Expand Up @@ -3519,7 +3521,7 @@ var TreeViewDD = A.Component.create(
// cannot drop the dragged element into any of its children
// nor above an undraggable element
// using DOM contains method for performance reason
if ( !! dropTreeNode.get(DRAGGABLE) && !dragNode.contains(dropNode)) {
if (!!dropTreeNode.get(DRAGGABLE) && !dragNode.contains(dropNode)) {
// nArea splits the height in 3 areas top/center/bottom
// these areas are responsible for defining the state when the mouse is over any of them
var nArea = nodeContent.get(OFFSET_HEIGHT) / 3;
Expand Down Expand Up @@ -3714,7 +3716,7 @@ var TreeViewDD = A.Component.create(

A.TreeViewDD = TreeViewDD;

}, '@VERSION@' ,{skinnable:true, requires:['aui-tree-node','aui-tree-paginator','aui-tree-io','dd-delegate','dd-proxy']});
}, '@VERSION@' ,{requires:['aui-tree-node','aui-tree-paginator','aui-tree-io','dd-delegate','dd-proxy'], skinnable:true});
AUI.add('aui-tree-io', function(A) {
var Lang = A.Lang,
isFunction = Lang.isFunction,
Expand Down
Loading

0 comments on commit 9d5951a

Please sign in to comment.