continue rebase, fix tests

Author: ngokevin

src/core/component.js

@@ -258,11 +258,7 @@ Component.prototype = {
     var key;
     var initialOldData;
     var skipTypeChecking;
-<<<<<<< HEAD
-    var oldData = this.oldData;
     var hasComponentChanged;
-=======
->>>>>>> object pooling in component core, optimize style parser to reuse object
 
     // Just cache the attribute if the entity has not loaded
     // Components are not initialized until the entity has loaded
@@ -292,11 +288,8 @@ Component.prototype = {
     // Cache previously passed attribute to decide if we skip type checking.
     this.previousAttrValue = attrValue;
 
-<<<<<<< HEAD
-    // Cache current attrValue for future updates. Updates `this.attrValue`.
-    attrValue = this.parseAttrValueForCache(attrValue);
-=======
     // Parse the attribute value.
+    // Cache current attrValue for future updates. Updates `this.attrValue`.
     attrValue = this.parseAttrValueForCache(attrValue);
 
     // Update previous attribute value to later decide if we skip type checking.
@@ -306,7 +299,6 @@ Component.prototype = {
     this.data = this.buildData(attrValue, clobber, false, skipTypeChecking);
 
     // Cache current attrValue for future updates.
->>>>>>> object pooling in component core, optimize style parser to reuse object
     this.updateCachedAttrValue(attrValue, clobber);
 
     if (this.updateSchema) {
@@ -337,22 +329,6 @@ Component.prototype = {
       if (el.isPlaying) { this.play(); }
       el.emit('componentinitialized', this.evtDetail, false);
     } else {
-<<<<<<< HEAD
-      hasComponentChanged = !utils.deepEqual(this.oldData, this.data);
-      // Don't update if properties haven't changed.
-      // Always update rotation, position, scale.
-      if (!this.isPositionRotationScale && !hasComponentChanged) { return; }
-     // Store current data as previous data for future updates.
-      this.oldData = extendProperties({}, this.data, isSinglePropSchema);
-      // Update component.
-      this.update(oldData);
-      // In the case of position, rotation, scale always update the component
-      // but don't emit componentchanged event if component has not changed.
-      if (!hasComponentChanged) { return; }
-=======
-      // Don't update if properties haven't changed
-      if (utils.deepEqual(this.oldData, this.data)) { return; }
-
       // Store the previous old data before we calculate the new oldData.
       if (this.previousOldData instanceof Object) {
         utils.objectPool.clearObject(this.previousOldData);
@@ -363,15 +339,20 @@ Component.prototype = {
         this.previousOldData = this.oldData;
       }
 
+      hasComponentChanged = !utils.deepEqual(this.oldData, this.data);
+
+      // Don't update if properties haven't changed.
+      // Always update rotation, position, scale.
+      if (!this.isPositionRotationScale && !hasComponentChanged) { return; }
+
       // Store current data as previous data for future updates.
       // Reuse `this.oldData` object to try not to allocate another one.
       if (this.oldData instanceof Object) { utils.objectPool.clearObject(this.oldData); }
       this.oldData = extendProperties(this.oldData, this.data, this.isObjectBased);
 
-      // Update component.
+      // Update component with the previous old data.
       this.update(this.previousOldData);
 
->>>>>>> object pooling in component core, optimize style parser to reuse object
       this.throttledEmitComponentChanged();
     }
   },
@@ -630,28 +611,20 @@ function copyData (dest, sourceData) {
 * @param {boolean} isObjectBased - Whether values are objects.
 * @returns Overridden object or value.
 */
-<<<<<<< HEAD
-function extendProperties (dest, source, isSinglePropSchema) {
-  if (isSinglePropSchema && (source === null || typeof source !== 'object')) { return source; }
-  var copy = utils.extend(dest, source);
-  var key;
-  for (key in copy) {
-    if (!copy[key] || copy[key].constructor !== Object) { continue; }
-    copy[key] = utils.clone(copy[key]);
-  }
-  return copy;
-=======
 function extendProperties (dest, source, isObjectBased) {
   var key;
-  if (isObjectBased && source instanceof Object) {
+  if (isObjectBased && source.constructor === Object) {
     for (key in source) {
       if (source[key] === undefined) { continue; }
-      dest[key] = source[key];
+      if (source[key] && source[key].constructor === Object) {
+        dest[key] = utils.clone(source[key]);
+      } else {
+        dest[key] = source[key];
+      }
     }
     return dest;
   }
   return source;
->>>>>>> object pooling in component core, optimize style parser to reuse object
 }
 
 /**

src/utils/styleParser.js

@@ -3,6 +3,7 @@
  * Some code adapted from `style-attr` (https://github.com/joshwnj/style-attr)
  * by Josh Johnston (MIT License).
  */
+var DASH_REGEX = /-([a-z])/g;
 
 /**
  * Deserialize style-like string into an object of properties.
@@ -38,7 +39,7 @@ module.exports.stringify = function (data) {
  * @return {string} CamelCased string.
  */
 function toCamelCase (str) {
-  return str.replace(/-([a-z])/g, upperCase);
+  return str.replace(DASH_REGEX, upperCase);
 }
 module.exports.toCamelCase = toCamelCase;
 

tests/core/a-entity.test.js

@@ -466,7 +466,6 @@ suite('a-entity', function () {
 
   suite('flushToDOM', function () {
     test('updates DOM attributes', function () {
-      var el = this.el;
       var material;
       var materialStr = 'color: #F0F; metalness: 0.75';
       el.setAttribute('material', materialStr);
@@ -478,7 +477,6 @@ suite('a-entity', function () {
     });
 
     test('updates DOM attributes of a multiple component', function () {
-      var el = this.el;
       var soundAttrValue;
       var soundStr = 'src: url(mysoundfile.mp3); autoplay: true';
       el.setAttribute('sound__1', {'src': 'url(mysoundfile.mp3)', autoplay: true});
@@ -907,16 +905,7 @@ suite('a-entity', function () {
       assert.equal(el.getAttribute('material').color, '#FFF');
     });
 
-    test('does not remove default component', function () {
-      var el = this.el;
-      assert.ok('position' in el.components);
-      el.removeAttribute('position');
-      assert.shallowDeepEqual(el.getDOMAttribute('position'), {});
-      assert.ok('position' in el.components);
-    });
-
     test('does not remove mixed-in component', function () {
-      var el = this.el;
       mixinFactory('foo', {position: '1 2 3'});
       mixinFactory('bar', {scale: '1 2 3'});
       el.setAttribute('mixin', 'foo bar');
@@ -934,8 +923,6 @@ suite('a-entity', function () {
 
   suite('initComponent', function () {
     test('initializes component', function () {
-      var el = this.el;
-      el.initComponent('material', false, 'color: #F0F; transparent: true');
       el.initComponent('material', 'color: #F0F; transparent: true', false);
       assert.ok(el.components.material);
     });
@@ -949,7 +936,6 @@ suite('a-entity', function () {
     });
 
     test('initializes dependency component and can set attribute', function () {
-      var el = this.el;
       el.initComponent('material', '', true);
       assert.shallowDeepEqual(el.getAttribute('material'), {});
     });

tests/core/component.test.js

@@ -289,25 +289,28 @@ suite('Component', function () {
     });
 
     test('does not emit componentchanged for multi-prop if not changed', function (done) {
-      el.addEventListener('componentinitialized', function (evt) {
+      function componentChanged (evt) {
         if (evt.detail.name !== 'material') { return; }
+        el.removeEventListener('componentchanged', componentChanged);
+        // Should not reach here.
+        assert.equal(true, false, 'Component should not have emitted changed.');
+      }
 
-        el.addEventListener('componentchanged', function (evt) {
-          if (evt.detail.name !== 'material') { return; }
-          // Should not reach here.
-          assert.equal(true, false, 'Component should not have emitted changed.');
-        });
-
-        // Update.
+      function componentInitialized (evt) {
+        if (evt.detail.name !== 'material') { return; }
+        el.addEventListener('componentchanged', componentChanged);
         el.setAttribute('material', 'color', 'red');
+      }
 
-        // Have `done()` race with the failing assertion in the event handler.
-        setTimeout(() => {
-          done();
-        }, 100);
-      });
-      // Initialization.
+      el.addEventListener('componentinitialized', componentInitialized);
       el.setAttribute('material', 'color', 'red');
+
+      // Have `done()` race with the failing assertion in the event handler.
+      setTimeout(() => {
+        el.removeEventListener('componentchanged', componentChanged);
+        el.removeEventListener('componentinitialized', componentInitialized);
+        done();
+      }, 100);
     });
 
     test('does not update for multi-prop if not changed', function (done) {
@@ -358,25 +361,27 @@ suite('Component', function () {
     });
 
     test('does not emit componentchanged for single-prop if not changed', function (done) {
-      el.addEventListener('componentinitialized', function (evt) {
-        if (evt.detail.name !== 'position') { return; }
+      function componentInitialized (evt) {
+        if (evt.detail.name !== 'visible') { return; }
+        el.addEventListener('componentchanged', componentChanged);
+        el.setAttribute('visible', false);
+      }
 
-        el.addEventListener('componentchanged', function (evt) {
-          if (evt.detail.name !== 'position') { return; }
-          // Should not reach here.
-          assert.equal(true, false, 'Component should not have emitted changed.');
-        });
+      function componentChanged (evt) {
+        if (evt.detail.name !== 'visible') { return; }
+        // Should not reach here.
+        assert.equal(true, false, 'Component should not have emitted changed.');
+      }
 
-        // Update.
-        el.setAttribute('position', {x: 1, y: 2, z: 3});
+      el.addEventListener('componentinitialized', componentInitialized);
+      el.setAttribute('visible', false);
 
-        // Have `done()` race with the failing assertion in the event handler.
-        setTimeout(() => {
-          done();
-        }, 100);
-      });
-      // Initialization.
-      el.setAttribute('position', {x: 1, y: 2, z: 3});
+      // Have `done()` race with the failing assertion in the event handler.
+      setTimeout(() => {
+        el.removeEventListener('componentinitialized', componentInitialized);
+        el.removeEventListener('componentchanged', componentChanged);
+        done();
+      }, 100);
     });
 
     test('does not emit componentchanged for value if not changed', function (done) {
@@ -437,8 +442,6 @@ suite('Component', function () {
     });
 
     test('does not clone properties from attrValue into data that are not plain objects', function () {
-      var attrValue;
-      var data;
       var el;
       registerComponent('dummy', {
         schema: {
@@ -458,6 +461,19 @@ suite('Component', function () {
       var el;
       var data;
 
+      registerComponent('dummy', {
+        schema: {
+          color: {type: 'string'},
+          direction: {type: 'vec3'},
+          el: {type: 'selector', default: 'body'}
+        }
+      });
+
+      el = document.createElement('a-entity');
+      el.hasLoaded = true;
+      el.setAttribute('dummy', '');
+      assert.notOk(el.components.dummy.attrValue.el);
+
       // Direction property preserved across updateProperties calls but cloned into a different
       // object.
       el.components.dummy.updateProperties({
@@ -702,8 +718,8 @@ suite('Component', function () {
 
   suite('updateProperties', function () {
     setup(function (done) {
-      components.dummy = undefined;
       var el = this.el = entityFactory();
+      components.dummy = undefined;
       if (el.hasLoaded) { done(); }
       el.addEventListener('loaded', function () { done(); });
     });
@@ -749,7 +765,7 @@ suite('Component', function () {
       el.addEventListener('loaded', function () { done(); });
     });
 
-    test('init is only called once if the init routine sets the component', function () {
+    test('init is called once if the init routine sets the component', function () {
       var initCanaryStub = sinon.stub();
       var el = this.el;
       registerComponent('dummy', {
@@ -1016,15 +1032,19 @@ suite('Component', function () {
   test('applies default array property types with no defined value', function (done) {
     var el;
     registerComponent('test', {
-      schema: {default: ['foo']},
+      schema: {
+        arr: {default: ['foo']}
+      },
 
       update: function () {
-        assert.equal(this.data[0], 'foo');
+        assert.equal(this.data.arr[0], 'foo');
         done();
       }
     });
     el = entityFactory();
-    el.setAttribute('test', '');
+    el.addEventListener('loaded', () => {
+      el.setAttribute('test', '');
+    });
   });
 });
 

tests/core/controls.test.js

@@ -1,4 +1,4 @@
-/* global AFRAME, Event, assert, process, setup, suite, test */
+/* global Event, assert, process, setup, suite, test */
 var helpers = require('../helpers');
 var PI = Math.PI;