Permalink
Browse files

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

  • Loading branch information...
2 parents d54cb6f + 399a310 commit dc3933533fed4bf70285ed6da59ed52c5cdbe0de @apipkin apipkin committed Jan 11, 2013
Showing with 1,057 additions and 216 deletions.
  1. +2 −0 .travis.yml
  2. +100 −94 build/attribute-core/attribute-core-coverage.js
  3. +7 −2 build/attribute-core/attribute-core-debug.js
  4. +1 −1 build/attribute-core/attribute-core-min.js
  5. +5 −1 build/attribute-core/attribute-core.js
  6. +2 −1 build/datatable-scroll/datatable-scroll-min.js
  7. +49 −46 build/datatable-table/datatable-table-coverage.js
  8. +3 −1 build/datatable-table/datatable-table-debug.js
  9. +1 −1 build/datatable-table/datatable-table-min.js
  10. +3 −1 build/datatable-table/datatable-table.js
  11. +2 −2 build/datatype-date-math/datatype-date-math-coverage.js
  12. +1 −1 build/datatype-date-math/datatype-date-math-debug.js
  13. +1 −1 build/datatype-date-math/datatype-date-math.js
  14. +2 −1 build/get/get-min.js
  15. +2 −2 build/loader-base/loader-base-coverage.js
  16. +1 −1 build/loader-base/loader-base-debug.js
  17. +4 −1 build/loader-base/loader-base-min.js
  18. +1 −1 build/loader-base/loader-base.js
  19. +5 −1 build/loader-yui3/loader-yui3-min.js
  20. +1 −1 build/loader/loader-debug.js
  21. +8 −1 build/loader/loader-min.js
  22. +1 −1 build/loader/loader.js
  23. +25 −2 build/simpleyui/simpleyui-min.js
  24. +6 −1 build/yui-base/yui-base-min.js
  25. +4 −1 build/yui-core/yui-core-min.js
  26. +1 −1 build/yui-nodejs/yui-nodejs-debug.js
  27. +14 −1 build/yui-nodejs/yui-nodejs-min.js
  28. +1 −1 build/yui-nodejs/yui-nodejs.js
  29. +1 −1 build/yui/yui-debug.js
  30. +14 −1 build/yui/yui-min.js
  31. +1 −1 build/yui/yui.js
  32. +1 −1 package.json
  33. +4 −0 src/attribute/HISTORY.md
  34. +7 −2 src/attribute/js/AttributeCore.js
  35. +74 −1 src/attribute/tests/unit/assets/attribute-core-tests.js
  36. +0 −21 src/cache/docs/cache-basic.mustache
  37. +15 −11 src/cache/docs/partials/cache-basic-source.mustache
  38. +5 −0 src/datatable/HISTORY.md
  39. +3 −1 src/datatable/js/table.js
  40. +25 −0 src/datatable/tests/unit/assets/datatable-base-tests.js
  41. +1 −1 src/date/js/date-math.js
  42. +1 −1 src/loader/build.json
  43. +40 −0 src/node/tests/perf/node-attrs-benchmark.js
  44. +82 −0 src/node/tests/perf/node-attrs.html
  45. +114 −0 src/node/tests/perf/node-core-benchmark.js
  46. +79 −0 src/node/tests/perf/node-core.html
  47. +46 −0 src/node/tests/perf/node-create-benchmark.js
  48. +66 −0 src/node/tests/perf/node-create.html
  49. +22 −0 src/node/tests/perf/node-data-benchmark.js
  50. +64 −0 src/node/tests/perf/node-data.html
  51. +75 −0 src/node/tests/perf/node-screen-benchmark.js
  52. +64 −0 src/node/tests/perf/node-screen.html
  53. +0 −5 src/slider/tests/unit/assets/slider-tests.js
View
@@ -15,3 +15,5 @@ install:
- ./src/common/travis/install.sh
script:
- ./src/common/travis/test.sh
+git:
+ depth: 30

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -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');
- allowSet = false;
+ if (initializing) {
+ 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;

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -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;
}
Oops, something went wrong.

0 comments on commit dc39335

Please sign in to comment.