Merge branch 'dev-master' of github.com:yui/yui3 into dt-2531914

yui · Jan 11, 2013 · dc39335 · dc39335
2 parents d54cb6f + 399a310
commit dc39335
Show file tree

Hide file tree

Showing 53 changed files with 1,057 additions and 216 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,3 +15,5 @@ install:
     - ./src/common/travis/install.sh
 script:
     - ./src/common/travis/test.sh
+git:
+    depth: 30
diff --git a/build/attribute-core/attribute-core-coverage.js b/build/attribute-core/attribute-core-coverage.js
diff --git a/build/attribute-core/attribute-core-debug.js b/build/attribute-core/attribute-core-debug.js
@@ -779,8 +779,13 @@ YUI.add('attribute-core', function (Y, NAME) {
                         retVal = setter.call(host, newVal, name, opts);
 
                         if (retVal === INVALID_VALUE) {
-                            Y.log('Attribute: ' + attrName + ', setter returned Attribute.INVALID_VALUE for value:' + newVal, 'warn', 'attribute');
+                            if (initializing) {
-                            allowSet = false;
+                                Y.log('Attribute: ' + attrName + ', setter returned Attribute.INVALID_VALUE for value:' + newVal + ', initializing to default value', 'warn', 'attribute');
+                                newVal = cfg.defaultValue;
+                            } else {
+                                Y.log('Attribute: ' + attrName + ', setter returned Attribute.INVALID_VALUE for value:' + newVal, 'warn', 'attribute');
+                                allowSet = false;
+                            }
                         } else if (retVal !== undefined){
                             Y.log('Attribute: ' + attrName + ', raw value: ' + newVal + ' modified by setter to:' + retVal, 'info', 'attribute');
                             newVal = retVal;

diff --git a/build/attribute-core/attribute-core-min.js b/build/attribute-core/attribute-core-min.js
diff --git a/build/attribute-core/attribute-core.js b/build/attribute-core/attribute-core.js
@@ -772,7 +772,11 @@ YUI.add('attribute-core', function (Y, NAME) {
                         retVal = setter.call(host, newVal, name, opts);
 
                         if (retVal === INVALID_VALUE) {
-                            allowSet = false;
+                            if (initializing) {
+                                newVal = cfg.defaultValue;
+                            } else {
+                                allowSet = false;
+                            }
                         } else if (retVal !== undefined){
                             newVal = retVal;
                         }