Skip to content

Commit

Permalink
Merge remote branch 'upstream/master' into docs
Browse files Browse the repository at this point in the history
  • Loading branch information
lsmith committed Jul 16, 2011
2 parents daa301d + 5cdd1d5 commit 4871109
Show file tree
Hide file tree
Showing 179 changed files with 1,489 additions and 22,372 deletions.
7 changes: 6 additions & 1 deletion build/anim-base/anim-base-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,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');
Expand Down
2 changes: 1 addition & 1 deletion build/anim-base/anim-base-min.js

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

7 changes: 6 additions & 1 deletion build/anim-base/anim-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,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) {
}
Expand Down
9 changes: 7 additions & 2 deletions build/anim/anim-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,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');
Expand Down Expand Up @@ -1204,5 +1209,5 @@ Y.Anim.behaviors.xy = {
}, '@VERSION@' ,{requires:['anim-base', 'node-screen']});


YUI.add('anim', function(Y){}, '@VERSION@' ,{skinnable:false, use:['anim-base', 'anim-color', 'anim-curve', 'anim-easing', 'anim-node-plugin', 'anim-scroll', 'anim-xy']});
YUI.add('anim', function(Y){}, '@VERSION@' ,{use:['anim-base', 'anim-color', 'anim-curve', 'anim-easing', 'anim-node-plugin', 'anim-scroll', 'anim-xy'], skinnable:false});

Loading

0 comments on commit 4871109

Please sign in to comment.