Permalink
Browse files

Merge branch 'master' of github.com:yui/yui3

  • Loading branch information...
msweeney committed Nov 16, 2012
2 parents 446e875 + 85affcc commit 0ad24062df329219badcb149794ddab947ced2d7
Showing with 2,381 additions and 2,079 deletions.
  1. +2 −1 .travis.yml
  2. +1 −0 README.md
  3. +128 −128 build/anim-base/anim-base-coverage.js
  4. +37 −36 build/anim-base/anim-base-debug.js
  5. +1 −1 build/anim-base/anim-base-min.js
  6. +37 −36 build/anim-base/anim-base.js
  7. +6 −6 build/anim-color/anim-color-coverage.js
  8. +5 −5 build/anim-color/anim-color-debug.js
  9. +1 −1 build/anim-color/anim-color-min.js
  10. +5 −5 build/anim-color/anim-color.js
  11. +23 −22 build/anim-curve/anim-curve-coverage.js
  12. +13 −11 build/anim-curve/anim-curve-debug.js
  13. +1 −1 build/anim-curve/anim-curve-min.js
  14. +13 −11 build/anim-curve/anim-curve.js
  15. +88 −92 build/anim-shape/anim-shape-coverage.js
  16. +16 −20 build/anim-shape/anim-shape-debug.js
  17. +1 −1 build/anim-shape/anim-shape-min.js
  18. +16 −20 build/anim-shape/anim-shape.js
  19. +2 −2 build/calendar-base/calendar-base-coverage.js
  20. +1 −1 build/calendar-base/calendar-base-debug.js
  21. +1 −1 build/calendar-base/calendar-base-min.js
  22. +1 −1 build/calendar-base/calendar-base.js
  23. +3 −2 build/calendarnavigator/calendarnavigator-coverage.js
  24. +2 −1 build/calendarnavigator/calendarnavigator-debug.js
  25. +1 −1 build/calendarnavigator/calendarnavigator-min.js
  26. +2 −1 build/calendarnavigator/calendarnavigator.js
  27. +18 −35 build/datatype-date-parse/datatype-date-parse-coverage.js
  28. +7 −20 build/datatype-date-parse/datatype-date-parse-debug.js
  29. +1 −1 build/datatype-date-parse/datatype-date-parse-min.js
  30. +6 −19 build/datatype-date-parse/datatype-date-parse.js
  31. +117 −109 build/event-focus/event-focus-coverage.js
  32. +16 −10 build/event-focus/event-focus-debug.js
  33. +1 −1 build/event-focus/event-focus-min.js
  34. +16 −10 build/event-focus/event-focus.js
  35. +293 −287 build/event-simulate/event-simulate-coverage.js
  36. +19 −12 build/event-simulate/event-simulate-debug.js
  37. +1 −1 build/event-simulate/event-simulate-min.js
  38. +19 −12 build/event-simulate/event-simulate.js
  39. +60 −59 build/event-tap/event-tap-coverage.js
  40. +5 −4 build/event-tap/event-tap-debug.js
  41. +1 −1 build/event-tap/event-tap-min.js
  42. +5 −4 build/event-tap/event-tap.js
  43. +17 −11 build/event-touch/event-touch-coverage.js
  44. +3 −0 build/event-touch/event-touch-debug.js
  45. +1 −1 build/event-touch/event-touch-min.js
  46. +3 −0 build/event-touch/event-touch.js
  47. +2 −2 build/loader-base/loader-base-coverage.js
  48. +1 −1 build/loader-base/loader-base-debug.js
  49. +1 −1 build/loader-base/loader-base-min.js
  50. +1 −1 build/loader-base/loader-base.js
  51. +1 −1 build/loader/loader-debug.js
  52. +1 −1 build/loader/loader-min.js
  53. +1 −1 build/loader/loader.js
  54. +85 −72 build/pjax-base/pjax-base-coverage.js
  55. +14 −6 build/pjax-base/pjax-base-debug.js
  56. +1 −1 build/pjax-base/pjax-base-min.js
  57. +14 −6 build/pjax-base/pjax-base.js
  58. +3 −3 build/pjax-content/pjax-content-coverage.js
  59. +2 −2 build/pjax-content/pjax-content-debug.js
  60. +1 −1 build/pjax-content/pjax-content-min.js
  61. +2 −2 build/pjax-content/pjax-content.js
  62. +319 −306 build/router/router-coverage.js
  63. +20 −10 build/router/router-debug.js
  64. +1 −1 build/router/router-min.js
  65. +20 −10 build/router/router.js
  66. +24 −21 build/simpleyui/simpleyui-debug.js
  67. +24 −21 build/simpleyui/simpleyui.js
  68. +2 −2 build/uploader-flash/uploader-flash-coverage.js
  69. +1 −1 build/uploader-flash/uploader-flash-debug.js
  70. +1 −1 build/uploader-flash/uploader-flash-min.js
  71. +1 −1 build/uploader-flash/uploader-flash.js
  72. +152 −149 build/uploader-html5/uploader-html5-coverage.js
  73. +43 −41 build/uploader-html5/uploader-html5-debug.js
  74. +1 −1 build/uploader-html5/uploader-html5-min.js
  75. +43 −41 build/uploader-html5/uploader-html5.js
  76. +3 −2 build/uploader-queue/uploader-queue-coverage.js
  77. +2 −1 build/uploader-queue/uploader-queue-debug.js
  78. +1 −1 build/uploader-queue/uploader-queue-min.js
  79. +2 −1 build/uploader-queue/uploader-queue.js
  80. +15 −2 build/yui-nodejs/yui-nodejs-coverage.js
  81. +28 −3 build/yui-nodejs/yui-nodejs-debug.js
  82. +1 −1 build/yui-nodejs/yui-nodejs-min.js
  83. +28 −3 build/yui-nodejs/yui-nodejs.js
  84. +14 −2 build/yui/yui-coverage.js
  85. +27 −3 build/yui/yui-debug.js
  86. +1 −1 build/yui/yui-min.js
  87. +27 −3 build/yui/yui.js
  88. +5 −5 src/anim/js/anim-color.js
  89. +13 −11 src/anim/js/anim-curve.js
  90. +48 −33 src/anim/js/anim-easing.js
  91. +1 −1 src/anim/js/anim-scroll.js
  92. +16 −20 src/anim/js/anim-shape.js
  93. +1 −1 src/anim/js/anim-xy.js
  94. +37 −36 src/anim/js/anim.js
  95. +10 −10 src/anim/meta/anim.json
  96. +8 −0 src/app/HISTORY.md
  97. +20 −10 src/app/js/router.js
  98. +15 −6 src/app/tests/unit/assets/app-content-test.js
  99. +47 −8 src/app/tests/unit/assets/router-test.js
  100. +1 −1 src/calendar/js/calendar-base.js
  101. +2 −2 src/calendar/js/calendarnavigator.js
  102. +8 −2 src/common/travis/before.sh
  103. +12 −12 src/common/travis/install.sh
  104. +5 −4 src/common/travis/test.sh
  105. +7 −20 src/date/js/date-parse.js
  106. +24 −24 src/date/tests/unit/assets/date-tests.js
  107. +1 −1 src/date/tests/unit/date.html
  108. +19 −12 src/event-simulate/js/event-simulate.js
  109. +3 −0 src/event/js/event-facade-dom-touch.js
  110. +5 −4 src/event/js/tap.js
  111. +17 −37 src/event/tests/unit/assets/event-tap-tests.js
  112. +1 −0 src/get/tests/unit/coverage.html
  113. +1 −1 src/loader/build.json
  114. +8 −0 src/pjax/HISTORY.md
  115. +14 −6 src/pjax/js/pjax-base.js
  116. +2 −2 src/pjax/js/pjax-content.js
  117. +19 −1 src/pjax/tests/unit/assets/pjax-test.js
  118. +6 −20 src/simpleyui/js/concat.js
  119. +1 −1 src/uploader/js/uploader-flash.js
  120. +43 −41 src/uploader/js/uploader-html5.js
  121. +2 −2 src/uploader/js/uploader-queue.js
  122. +12 −11 src/uploader/tests/unit/uploaderhtml5.html
View
@@ -7,7 +7,8 @@ branches:
only:
- master
- 3.x
- - ie10
+ - dev-master
+ - dev-3.x
before_install:
- ./src/common/travis/before.sh
install:
View
@@ -74,3 +74,4 @@ Shifter also allows you to rebuild the entire YUI src tree:
cd yui3/src && shifter --walk
+

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -87,7 +87,7 @@ YUI.add('anim-base', function (Y, NAME) {
};
/**
- * Time in milliseconds passed to setInterval for frame processing
+ * Time in milliseconds passed to setInterval for frame processing
*
* @property intervalTime
* @default 20
@@ -175,7 +175,7 @@ YUI.add('anim-base', function (Y, NAME) {
node: {
setter: function(node) {
if (node) {
- if (typeof node == 'string' || node.nodeType) {
+ if (typeof node === 'string' || node.nodeType) {
node = Y.one(node);
}
}
@@ -198,7 +198,7 @@ YUI.add('anim-base', function (Y, NAME) {
},
/**
- * The method that will provide values to the attribute(s) during the animation.
+ * The method that will provide values to the attribute(s) during the animation.
* Defaults to "Easing.easeNone".
* @attribute easing
* @type Function
@@ -251,7 +251,7 @@ YUI.add('anim-base', function (Y, NAME) {
* Date stamp for the first frame of the animation.
* @attribute startTime
* @type Int
- * @default 0
+ * @default 0
* @readOnly
*/
startTime: {
@@ -263,7 +263,7 @@ YUI.add('anim-base', function (Y, NAME) {
* Current time the animation has been running.
* @attribute elapsedTime
* @type Int
- * @default 0
+ * @default 0
* @readOnly
*/
elapsedTime: {
@@ -273,9 +273,9 @@ YUI.add('anim-base', function (Y, NAME) {
/**
* Whether or not the animation is currently running.
- * @attribute running
+ * @attribute running
* @type Boolean
- * @default false
+ * @default false
* @readOnly
*/
running: {
@@ -287,18 +287,18 @@ YUI.add('anim-base', function (Y, NAME) {
},
/**
- * The number of times the animation should run
+ * The number of times the animation should run
* @attribute iterations
* @type Int
- * @default 1
+ * @default 1
*/
iterations: {
value: 1
},
/**
* The number of iterations that have occurred.
- * Resets when an animation ends (reaches iteration count or stop() called).
+ * Resets when an animation ends (reaches iteration count or stop() called).
* @attribute iterationCount
* @type Int
* @default 0
@@ -310,7 +310,7 @@ YUI.add('anim-base', function (Y, NAME) {
},
/**
- * How iterations of the animation should behave.
+ * How iterations of the animation should behave.
* Possible values are "normal" and "alternate".
* Normal will repeat the animation, alternate will reverse on every other pass.
*
@@ -324,9 +324,9 @@ YUI.add('anim-base', function (Y, NAME) {
/**
* Whether or not the animation is currently paused.
- * @attribute paused
+ * @attribute paused
* @type Boolean
- * @default false
+ * @default false
* @readOnly
*/
paused: {
@@ -338,7 +338,7 @@ YUI.add('anim-base', function (Y, NAME) {
* If true, animation begins from last frame
* @attribute reverse
* @type Boolean
- * @default false
+ * @default false
*/
reverse: {
value: false
@@ -351,10 +351,11 @@ YUI.add('anim-base', function (Y, NAME) {
* Runs all animation instances.
* @method run
* @static
- */
+ */
Y.Anim.run = function() {
- var instances = Y.Anim._instances;
- for (var i in instances) {
+ var instances = Y.Anim._instances,
+ i;
+ for (i in instances) {
if (instances[i].run) {
instances[i].run();
}
@@ -365,7 +366,7 @@ YUI.add('anim-base', function (Y, NAME) {
* Pauses all animation instances.
* @method pause
* @static
- */
+ */
Y.Anim.pause = function() {
for (var i in _running) { // stop timer if nothing running
if (_running[i].pause) {
@@ -380,7 +381,7 @@ YUI.add('anim-base', function (Y, NAME) {
* Stops all animation instances.
* @method stop
* @static
- */
+ */
Y.Anim.stop = function() {
for (var i in _running) { // stop timer if nothing running
if (_running[i].stop) {
@@ -389,7 +390,7 @@ YUI.add('anim-base', function (Y, NAME) {
}
Y.Anim._stopTimer();
};
-
+
Y.Anim._startTimer = function() {
if (!_timer) {
_timer = setInterval(Y.Anim._runFrame, Y.Anim._intervalTime);
@@ -406,10 +407,11 @@ YUI.add('anim-base', function (Y, NAME) {
* @method _runFrame
* @private
* @static
- */
+ */
Y.Anim._runFrame = function() {
- var done = true;
- for (var anim in _running) {
+ var done = true,
+ anim;
+ for (anim in _running) {
if (_running[anim]._runFrame) {
done = false;
_running[anim]._runFrame();
@@ -428,7 +430,7 @@ YUI.add('anim-base', function (Y, NAME) {
* Starts or resumes an animation.
* @method run
* @chainable
- */
+ */
run: function() {
if (this.get(PAUSED)) {
this._resume();
@@ -444,7 +446,7 @@ YUI.add('anim-base', function (Y, NAME) {
* Calling run() will continue where it left off.
* @method pause
* @chainable
- */
+ */
pause: function() {
if (this.get(RUNNING)) {
this._pause();
@@ -457,7 +459,7 @@ YUI.add('anim-base', function (Y, NAME) {
* @method stop
* @param {Boolean} finish If true, the animation will move to the last frame
* @chainable
- */
+ */
stop: function(finish) {
if (this.get(RUNNING) || this.get(PAUSED)) {
this._end(finish);
@@ -526,10 +528,8 @@ YUI.add('anim-base', function (Y, NAME) {
var d = this._runtimeAttr.duration,
t = new Date() - this.get(START_TIME),
reverse = this.get(REVERSE),
- done = (t >= d),
- attribute,
- setter;
-
+ done = (t >= d);
+
this._runAttrs(t, d, reverse);
this._actualFrames += 1;
this._set(ELAPSED_TIME, t);
@@ -566,9 +566,9 @@ YUI.add('anim-base', function (Y, NAME) {
customAttr[i].set : Y.Anim.DEFAULT_SETTER;
if (!done) {
- setter(this, i, attribute.from, attribute.to, t, d, easing, attribute.unit);
+ setter(this, i, attribute.from, attribute.to, t, d, easing, attribute.unit);
} else {
- setter(this, i, attribute.from, attribute.to, lastFrame, d, easing, attribute.unit);
+ setter(this, i, attribute.from, attribute.to, lastFrame, d, easing, attribute.unit);
}
}
}
@@ -625,8 +625,8 @@ YUI.add('anim-base', function (Y, NAME) {
begin = begin.call(this, node);
}
- var mFrom = Y.Anim.RE_UNITS.exec(begin);
- var mTo = Y.Anim.RE_UNITS.exec(val);
+ var mFrom = Y.Anim.RE_UNITS.exec(begin),
+ mTo = Y.Anim.RE_UNITS.exec(val);
begin = mFrom ? mFrom[1] : begin;
end = mTo ? mTo[1] : val;
@@ -658,10 +658,11 @@ YUI.add('anim-base', function (Y, NAME) {
var node = this._node,
val = node.getComputedStyle(attr),
get = (attr === 'left') ? 'getX': 'getY',
- set = (attr === 'left') ? 'setX': 'setY';
+ set = (attr === 'left') ? 'setX': 'setY',
+ position;
if (val === 'auto') {
- var position = node.getStyle('position');
+ position = node.getStyle('position');
if (position === 'absolute' || position === 'fixed') {
val = node[get]();
node[set](val);

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

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 0ad2406

Please sign in to comment.