| OLD | NEW |
| 1 // Copyright 2014 Google Inc. All rights reserved. | 1 // Copyright 2014 Google Inc. All rights reserved. |
| 2 // | 2 // |
| 3 // Licensed under the Apache License, Version 2.0 (the "License"); | 3 // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 // you may not use this file except in compliance with the License. | 4 // you may not use this file except in compliance with the License. |
| 5 // You may obtain a copy of the License at | 5 // You may obtain a copy of the License at |
| 6 // | 6 // |
| 7 // http://www.apache.org/licenses/LICENSE-2.0 | 7 // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 // | 8 // |
| 9 // Unless required by applicable law or agreed to in writing, software | 9 // Unless required by applicable law or agreed to in writing, software |
| 10 // distributed under the License is distributed on an "AS IS" BASIS, | 10 // distributed under the License is distributed on an "AS IS" BASIS, |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 return shared.calculateTimeFraction(activeDuration, localTime, timing); | 21 return shared.calculateTimeFraction(activeDuration, localTime, timing); |
| 22 }; | 22 }; |
| 23 animationNode._totalDuration = timing.delay + activeDuration + timing.endDel
ay; | 23 animationNode._totalDuration = timing.delay + activeDuration + timing.endDel
ay; |
| 24 animationNode._isCurrent = function(localTime) { | 24 animationNode._isCurrent = function(localTime) { |
| 25 var phase = shared.calculatePhase(activeDuration, localTime, timing); | 25 var phase = shared.calculatePhase(activeDuration, localTime, timing); |
| 26 return phase === PhaseActive || phase === PhaseBefore; | 26 return phase === PhaseActive || phase === PhaseBefore; |
| 27 }; | 27 }; |
| 28 return animationNode; | 28 return animationNode; |
| 29 }; | 29 }; |
| 30 | 30 |
| 31 })(webAnimationsShared, webAnimationsMinifill); | 31 })(webAnimationsShared, webAnimations1); |
| OLD | NEW |