Merge pull request #263 from rjwright/RenameScopes

rjwright · rjwright · commit b7ddbae8a345 · 2014-12-17T15:10:19.000+11:00
Remove "minifill" and "maxifill" naming
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -102,31 +102,31 @@ module.exports = function(grunt) {
     WEB_ANIMATIONS_TESTING: false
   };
 
-  function buildMinifill(target) {
+  function buildWebAnimations1(target) {
     var config = targetConfig[target];
     return genTarget(target).concat([
-      concat(config.scopeSrc.concat(config.sharedSrc).concat(config.minifillSrc), 'inter-raw-' + target + '.js', concatDefines),
+      concat(config.scopeSrc.concat(config.sharedSrc).concat(config.webAnimations1Src), 'inter-raw-' + target + '.js', concatDefines),
       guard('inter-raw-' + target + '.js', 'inter-' + target + '.js'),
       compress('inter-' + target + '.js', target + '.min.js', concatDefines)
     ]);
   }
 
-  function buildMaxifill(target) {
+  function buildWebAnimationsNext(target) {
     var config = targetConfig[target];
     return genTarget(target).concat([
       concat(config.scopeSrc.concat(config.sharedSrc), 'inter-' + target + '-preamble.js', concatDefines),
-      concat(config.minifillSrc, 'inter-component-' + target + 'minifill.js', concatDefines),
-      guard('inter-component-' + target + 'minifill.js', 'inter-guarded-' + target + '-minifill.js'),
-      concat(config.maxifillSrc, 'inter-component-' + target + '.js', concatDefines),
-      concatWithMaps(['inter-' + target + '-preamble.js', 'inter-guarded-' + target + '-minifill.js', 'inter-component-' + target + '.js'],
+      concat(config.webAnimations1Src, 'inter-component-' + target + 'web-animations-1.js', concatDefines),
+      guard('inter-component-' + target + 'web-animations-1.js', 'inter-guarded-' + target + '-web-animations-1.js'),
+      concat(config.webAnimationsNextSrc, 'inter-component-' + target + '.js', concatDefines),
+      concatWithMaps(['inter-' + target + '-preamble.js', 'inter-guarded-' + target + '-web-animations-1.js', 'inter-component-' + target + '.js'],
           'inter-' + target + '.js'),
       compress('inter-' + target + '.js', target + '.min.js', concatDefines)
     ]);
   }
 
-  grunt.registerTask('web-animations', buildMinifill('web-animations'));
-  grunt.registerTask('web-animations-next', buildMaxifill('web-animations-next'));
-  grunt.registerTask('web-animations-next-lite', buildMaxifill('web-animations-next-lite'));
+  grunt.registerTask('web-animations', buildWebAnimations1('web-animations'));
+  grunt.registerTask('web-animations-next', buildWebAnimationsNext('web-animations-next'));
+  grunt.registerTask('web-animations-next-lite', buildWebAnimationsNext('web-animations-next-lite'));
 
   var testTargets = {'web-animations': {}, 'web-animations-next': {}};
 
diff --git a/src/animation-constructor.js b/src/animation-constructor.js
@@ -141,4 +141,4 @@
 
   scope.groupChildDuration = groupChildDuration;
 
-}(webAnimationsShared, webAnimationsMaxifill, webAnimationsTesting));
+}(webAnimationsShared, webAnimationsNext, webAnimationsTesting));
diff --git a/src/animation-node.js b/src/animation-node.js
@@ -28,4 +28,4 @@
     return animationNode;
   };
 
-})(webAnimationsShared, webAnimationsMinifill);
+})(webAnimationsShared, webAnimations1);
diff --git a/src/animation.js b/src/animation.js
@@ -59,7 +59,7 @@
   };
 
   if (WEB_ANIMATIONS_TESTING) {
-    testing.minifillAnimation = scope.Animation;
+    testing.webAnimations1Animation = scope.Animation;
   }
 
-})(webAnimationsShared, webAnimationsMinifill, webAnimationsTesting);
+})(webAnimationsShared, webAnimations1, webAnimationsTesting);
diff --git a/src/apply-preserving-inline-style.js b/src/apply-preserving-inline-style.js
@@ -189,4 +189,4 @@
   if (WEB_ANIMATIONS_TESTING)
     testing.ensureStyleIsPatched = ensureStyleIsPatched;
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
diff --git a/src/apply.js b/src/apply.js
@@ -22,4 +22,4 @@
     element.style[scope.propertyName(property)] = '';
   };
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
diff --git a/src/box-handler.js b/src/box-handler.js
@@ -54,4 +54,4 @@
 
   scope.addPropertiesHandler(parseBox, mergeBoxes, ['clip']);
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
diff --git a/src/color-handler.js b/src/color-handler.js
@@ -59,4 +59,4 @@
     testing.parseColor = parseColor;
   }
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
diff --git a/src/dimension-handler.js b/src/dimension-handler.js
@@ -164,4 +164,4 @@
     'word-spacing',
   ]);
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
diff --git a/src/effect-callback.js b/src/effect-callback.js
@@ -83,4 +83,4 @@
       register(this._callback);
   };
 
-})(webAnimationsShared, webAnimationsMaxifill, webAnimationsTesting);
+})(webAnimationsShared, webAnimationsNext, webAnimationsTesting);
diff --git a/src/effect.js b/src/effect.js
@@ -107,4 +107,4 @@
     testing.makeInterpolations = makeInterpolations;
   }
 
-})(webAnimationsShared, webAnimationsMinifill, webAnimationsTesting);
+})(webAnimationsShared, webAnimations1, webAnimationsTesting);
diff --git a/src/element-animatable.js b/src/element-animatable.js
@@ -16,4 +16,4 @@
   window.Element.prototype.animate = function(effectInput, timingInput) {
     return scope.timeline._play(scope.Animation(this, effectInput, timingInput));
   };
-})(webAnimationsMinifill);
+})(webAnimations1);
diff --git a/src/font-weight-handler.js b/src/font-weight-handler.js
@@ -39,4 +39,4 @@
 
   scope.addPropertiesHandler(parse, merge, ['font-weight']);
 
-})(webAnimationsMinifill);
+})(webAnimations1);
diff --git a/src/group-constructors.js b/src/group-constructors.js
@@ -79,4 +79,4 @@
   };
 
 
-})(webAnimationsShared, webAnimationsMaxifill, webAnimationsTesting);
+})(webAnimationsShared, webAnimationsNext, webAnimationsTesting);
diff --git a/src/handler-utils.js b/src/handler-utils.js
@@ -174,4 +174,4 @@
   scope.mergeWrappedNestedRepeated = mergeWrappedNestedRepeated;
   scope.mergeList = mergeList;
 
-})(webAnimationsMinifill);
+})(webAnimations1);
diff --git a/src/interpolation.js b/src/interpolation.js
@@ -46,4 +46,4 @@
     testing.interpolate = interpolate;
   }
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
diff --git a/src/matrix-decomposition.js b/src/matrix-decomposition.js
@@ -449,4 +449,4 @@
   scope.dot = dot;
   scope.makeMatrixDecomposition = makeMatrixDecomposition;
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
diff --git a/src/matrix-interpolation.js b/src/matrix-interpolation.js
@@ -127,4 +127,4 @@
   scope.composeMatrix = composeMatrix;
   scope.quat = quat;
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
diff --git a/src/number-handler.js b/src/number-handler.js
@@ -69,4 +69,4 @@
   scope.mergeNumbers = mergeNumbers;
   scope.numberToString = numberToString;
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
diff --git a/src/player.js b/src/player.js
@@ -190,4 +190,4 @@
     testing.Player = scope.Player;
   }
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
diff --git a/src/position-handler.js b/src/position-handler.js
@@ -114,4 +114,4 @@
   var mergePositionList = scope.mergeNestedRepeated.bind(null, mergeOffsetList, ', ');
   scope.addPropertiesHandler(parsePositionList, mergePositionList, ['background-position', 'object-position']);
 
-})(webAnimationsMinifill);
+})(webAnimations1);
diff --git a/src/property-interpolation.js b/src/property-interpolation.js
@@ -58,5 +58,5 @@
   }
   scope.propertyInterpolation = propertyInterpolation;
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
 
diff --git a/src/property-names.js b/src/property-names.js
@@ -32,4 +32,4 @@
     return aliased[property] || property;
   };
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
diff --git a/src/scope.js b/src/scope.js
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 var webAnimationsShared = {};
-var webAnimationsMinifill = {};
-var webAnimationsMaxifill = {};
+var webAnimations1 = {};
+var webAnimationsNext = {};
 
 if (!WEB_ANIMATIONS_TESTING)
   var webAnimationsTesting = null;
diff --git a/src/shadow-handler.js b/src/shadow-handler.js
@@ -105,4 +105,4 @@
   var mergeShadowList = mergeNestedRepeatedShadow.bind(null, mergeShadow, ', ');
   scope.addPropertiesHandler(parseShadowList, mergeShadowList, ['box-shadow', 'text-shadow']);
 
-})(webAnimationsMinifill);
+})(webAnimations1);
diff --git a/src/shape-handler.js b/src/shape-handler.js
@@ -82,4 +82,4 @@
 
   scope.addPropertiesHandler(parseShape, mergeShapes, ['shape-outside']);
 
-})(webAnimationsMinifill);
+})(webAnimations1);
diff --git a/src/tick.js b/src/tick.js
@@ -145,4 +145,4 @@
   var timeline = new InternalTimeline();
   scope.timeline = timeline;
 
-})(webAnimationsShared, webAnimationsMinifill, webAnimationsTesting);
+})(webAnimationsShared, webAnimations1, webAnimationsTesting);
diff --git a/src/timeline.js b/src/timeline.js
@@ -21,7 +21,7 @@
   };
 
   scope.AnimationTimeline.prototype = {
-    // FIXME: This needs to return the wrapped players in maxifill
+    // FIXME: This needs to return the wrapped players in Web Animations Next
     // TODO: Does this need to be sorted?
     // TODO: Do we need to consider needsRetick?
     getAnimationPlayers: function() {
@@ -36,29 +36,29 @@
     play: function(source) {
       var player = new scope.Player(source);
       this._players.push(player);
-      scope.restartMaxifillTick();
+      scope.restartWebAnimationsNextTick();
       player.play();
       return player;
     },
   };
 
   var ticking = false;
 
-  scope.restartMaxifillTick = function() {
+  scope.restartWebAnimationsNextTick = function() {
     if (!ticking) {
       ticking = true;
-      requestAnimationFrame(maxifillTick);
+      requestAnimationFrame(webAnimationsNextTick);
     }
   };
 
-  function maxifillTick(t) {
+  function webAnimationsNextTick(t) {
     var timeline = window.document.timeline;
     timeline.currentTime = t;
     timeline._discardPlayers();
     if (timeline._players.length == 0)
       ticking = false;
     else
-      requestAnimationFrame(maxifillTick);
+      requestAnimationFrame(webAnimationsNextTick);
   }
 
   var timeline = new scope.AnimationTimeline();
@@ -74,4 +74,4 @@
     window.document.timeline = timeline;
   } catch (e) { }
 
-})(webAnimationsShared, webAnimationsMaxifill, webAnimationsTesting);
+})(webAnimationsShared, webAnimationsNext, webAnimationsTesting);
diff --git a/src/transform-handler.js b/src/transform-handler.js
@@ -259,4 +259,4 @@
   if (WEB_ANIMATIONS_TESTING)
     testing.parseTransform = parseTransform;
 
-})(webAnimationsMinifill, webAnimationsTesting);
+})(webAnimations1, webAnimationsTesting);
diff --git a/src/visibility-handler.js b/src/visibility-handler.js
@@ -25,5 +25,5 @@
 
   scope.addPropertiesHandler(String, merge, ['visibility']);
 
-})(webAnimationsMinifill);
+})(webAnimations1);
 
diff --git a/src/web-animations-next-player.js b/src/web-animations-next-player.js
@@ -159,4 +159,4 @@
     },
   };
 
-})(webAnimationsShared, webAnimationsMaxifill, webAnimationsTesting);
+})(webAnimationsShared, webAnimationsNext, webAnimationsTesting);
diff --git a/target-config.js b/target-config.js
@@ -3,7 +3,7 @@
   var scopeSrc = [
       'src/scope.js'];
 
-  var minifillSrc = [
+  var webAnimations1Src = [
       'src/animation-node.js',
       'src/effect.js',
       'src/property-interpolation.js',
@@ -29,7 +29,7 @@
       'src/property-names.js',
   ];
 
-  var liteMinifillSrc = [
+  var liteWebAnimations1Src = [
       'src/animation-node.js',
       'src/effect.js',
       'src/property-interpolation.js',
@@ -57,14 +57,14 @@
       'src/deprecation.js',
   ];
 
-  var maxifillSrc = [
+  var webAnimationsNextSrc = [
       'src/timeline.js',
-      'src/maxifill-player.js',
+      'src/web-animations-next-player.js',
       'src/animation-constructor.js',
       'src/effect-callback.js',
       'src/group-constructors.js'];
 
-  var minifillTest = [
+  var webAnimations1Test = [
       'test/js/animation-node.js',
       'test/js/apply-preserving-inline-style.js',
       'test/js/box-handler.js',
@@ -81,7 +81,7 @@
       'test/js/timing.js',
       'test/js/transform-handler.js'];
 
-  var maxifillTest = minifillTest.concat(
+  var webAnimationsNextTest = webAnimations1Test.concat(
       'test/js/animation-constructor.js',
       'test/js/effect-callback.js',
       'test/js/group-constructors.js',
@@ -94,25 +94,25 @@
     'web-animations': {
       scopeSrc: scopeSrc,
       sharedSrc: sharedSrc,
-      minifillSrc: minifillSrc,
-      maxifillSrc: [],
-      src: scopeSrc.concat(sharedSrc).concat(minifillSrc),
-      test: minifillTest,
+      webAnimations1Src: webAnimations1Src,
+      webAnimationsNextSrc: [],
+      src: scopeSrc.concat(sharedSrc).concat(webAnimations1Src),
+      test: webAnimations1Test,
     },
     'web-animations-next': {
       scopeSrc: scopeSrc,
       sharedSrc: sharedSrc,
-      minifillSrc: minifillSrc,
-      maxifillSrc: maxifillSrc,
-      src: scopeSrc.concat(sharedSrc).concat(minifillSrc).concat(maxifillSrc),
-      test: maxifillTest,
+      webAnimations1Src: webAnimations1Src,
+      webAnimationsNextSrc: webAnimationsNextSrc,
+      src: scopeSrc.concat(sharedSrc).concat(webAnimations1Src).concat(webAnimationsNextSrc),
+      test: webAnimationsNextTest,
     },
     'web-animations-next-lite': {
       scopeSrc: scopeSrc,
       sharedSrc: sharedSrc,
-      minifillSrc: liteMinifillSrc,
-      maxifillSrc: maxifillSrc,
-      src: scopeSrc.concat(sharedSrc).concat(liteMinifillSrc).concat(maxifillSrc),
+      webAnimations1Src: liteWebAnimations1Src,
+      webAnimationsNextSrc: webAnimationsNextSrc,
+      src: scopeSrc.concat(sharedSrc).concat(liteWebAnimations1Src).concat(webAnimationsNextSrc),
       test: [],
     },
   };
diff --git a/test/blink/interpolation/font-size-interpolation.html b/test/blink/interpolation/font-size-interpolation.html
@@ -37,7 +37,7 @@
   {at: 1.5, is: '19px'},
 ]);
 
-// The minifill does not support inherit.
+// Web Animations 1 does not support inherit.
 // assertInterpolation({
 //   property: 'font-size',
 //   from: 'inherit',
diff --git a/test/js/animation-node.js b/test/js/animation-node.js
@@ -93,8 +93,8 @@ suite('animation-node', function() {
   test('Animation Node', function() {
     var timing = normalizeTimingInput({duration: 1000, iterations: 4, iterationStart: 0.5, easing: 'linear', direction: 'alternate', delay: 100, fill: 'forwards'});
     var timing2 = normalizeTimingInput({duration: 1000, iterations: 4, iterationStart: 0.5, easing: 'ease', direction: 'alternate', delay: 100, fill: 'forwards'});
-    var node = webAnimationsMinifill.AnimationNode(timing);
-    var node2 = webAnimationsMinifill.AnimationNode(timing2);
+    var node = webAnimations1.AnimationNode(timing);
+    var node2 = webAnimations1.AnimationNode(timing2);
     assert.equal(node(0), null);
     assert.equal(node(100), 0.5);
     assert.closeTo(node2(100), 0.8, 0.005);
diff --git a/test/js/box-handler.js b/test/js/box-handler.js
diff --git a/test/js/color-handler.js b/test/js/color-handler.js
diff --git a/test/js/dimension-handler.js b/test/js/dimension-handler.js
diff --git a/test/js/effect-callback.js b/test/js/effect-callback.js
diff --git a/test/js/effect.js b/test/js/effect.js
diff --git a/test/js/group-player.js b/test/js/group-player.js
diff --git a/test/js/matrix-interpolation.js b/test/js/matrix-interpolation.js
diff --git a/test/js/number-handler.js b/test/js/number-handler.js
diff --git a/test/js/player.js b/test/js/player.js
diff --git a/test/js/property-interpolation.js b/test/js/property-interpolation.js
diff --git a/test/js/tick.js b/test/js/tick.js
diff --git a/test/js/timeline.js b/test/js/timeline.js
diff --git a/test/js/timing.js b/test/js/timing.js
diff --git a/test/js/transform-handler.js b/test/js/transform-handler.js
diff --git a/web-animations-next-lite.dev.html b/web-animations-next-lite.dev.html
diff --git a/web-animations-next.dev.html b/web-animations-next.dev.html

Original file line number	Diff line number	Diff line change
`@@ -141,4 +141,4 @@`
`141`	`141`
`142`	`142`	`scope.groupChildDuration = groupChildDuration;`
`143`	`143`
`144`		`-}(webAnimationsShared, webAnimationsMaxifill, webAnimationsTesting));`
	`144`	`+}(webAnimationsShared, webAnimationsNext, webAnimationsTesting));`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@`
`59`	`59`	`};`
`60`	`60`
`61`	`61`	`if (WEB_ANIMATIONS_TESTING) {`
`62`		`- testing.minifillAnimation = scope.Animation;`
	`62`	`+ testing.webAnimations1Animation = scope.Animation;`
`63`	`63`	`}`
`64`	`64`
`65`		`-})(webAnimationsShared, webAnimationsMinifill, webAnimationsTesting);`
	`65`	`+})(webAnimationsShared, webAnimations1, webAnimationsTesting);`
Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,4 @@`
`54`	`54`
`55`	`55`	`scope.addPropertiesHandler(parseBox, mergeBoxes, ['clip']);`
`56`	`56`
`57`		`-})(webAnimationsMinifill, webAnimationsTesting);`
	`57`	`+})(webAnimations1, webAnimationsTesting);`
Original file line number	Diff line number	Diff line change
`@@ -59,4 +59,4 @@`
`59`	`59`	`testing.parseColor = parseColor;`
`60`	`60`	`}`
`61`	`61`
`62`		`-})(webAnimationsMinifill, webAnimationsTesting);`
	`62`	`+})(webAnimations1, webAnimationsTesting);`