Merge commit 'dc3c9e2e575e0bc55332dc136cafe7db73e399b6'

brunofp · Aug 26, 2011 · b19f55c · b19f55c
2 parents 0b34d8c + dc3c9e2
commit b19f55c
Show file tree

Hide file tree

Showing 1,892 changed files with 80,557 additions and 230,929 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "lib/yui3"]
 	path = lib/yui3
 	url = git://github.com/liferay/yui3.git
+[submodule "lib/ace"]
+	path = lib/ace
+	url = git://github.com/ajaxorg/ace.git
diff --git a/build/anim-base/anim-base-debug.js b/build/anim-base/anim-base-debug.js
@@ -167,7 +167,12 @@ YUI.add('anim-base', function(Y) {
          */
         node: {
             setter: function(node) {
-                node = Y.one(node);
+                if (node) {
+                    if (typeof node == 'string' || node.nodeType) {
+                        node = Y.one(node);
+                    }
+                }
+
                 this._node = node;
                 if (!node) {
                     Y.log(node + ' is not a valid node', 'warn', 'Anim');

diff --git a/build/anim-base/anim-base-min.js b/build/anim-base/anim-base-min.js
diff --git a/build/anim-base/anim-base.js b/build/anim-base/anim-base.js
@@ -167,7 +167,12 @@ YUI.add('anim-base', function(Y) {
          */
         node: {
             setter: function(node) {
-                node = Y.one(node);
+                if (node) {
+                    if (typeof node == 'string' || node.nodeType) {
+                        node = Y.one(node);
+                    }
+                }
+
                 this._node = node;
                 if (!node) {
                 }

diff --git a/build/anim/anim-debug.js b/build/anim/anim-debug.js
@@ -167,7 +167,12 @@ YUI.add('anim-base', function(Y) {
          */
         node: {
             setter: function(node) {
-                node = Y.one(node);
+                if (node) {
+                    if (typeof node == 'string' || node.nodeType) {
+                        node = Y.one(node);
+                    }
+                }
+
                 this._node = node;
                 if (!node) {
                     Y.log(node + ' is not a valid node', 'warn', 'Anim');
@@ -1211,5 +1216,5 @@ Y.Anim.behaviors.xy = {
 }, '3.4.0' ,{requires:['anim-base', 'node-screen']});
 
 
-YUI.add('anim', function(Y){}, '3.4.0' ,{skinnable:false, use:['anim-base', 'anim-color', 'anim-curve', 'anim-easing', 'anim-node-plugin', 'anim-scroll', 'anim-xy']});
+YUI.add('anim', function(Y){}, '3.4.0' ,{use:['anim-base', 'anim-color', 'anim-curve', 'anim-easing', 'anim-node-plugin', 'anim-scroll', 'anim-xy'], skinnable:false});