Update braces, start looking at async test

Author: wilddamon

src/css-image-value.js

@@ -18,8 +18,9 @@
     this.state = "loaded";
     this.intrinsicWidth = this._image.naturalWidth;
     this.intrinsicHeight = this._image.naturalHeight;
-    if (this.intrinsicHeight != 0)
+    if (this.intrinsicHeight != 0) {
       this.intrinsicRatio = this.intrinsicWidth / this.intrinsicHeight;
+    }
   }
 
   function onError() {
@@ -44,13 +45,17 @@
       }
 
       this._image = image;
-      this.state = "unloaded";
-      this.intrinsicWidth = null;
-      this.intrinsicHeight = null;
-      this.intrinsicRatio = null;
-      this._image.onload = onLoad.bind(this);
-      this._image.onerror = onError.bind(this);
-      this._image.onprogess = onProgress.bind(this);
+      //if (image.complete) {
+      //  onLoad.call(this);
+      //} else {
+        this.state = "unloaded";
+        this.intrinsicWidth = null;
+        this.intrinsicHeight = null;
+        this.intrinsicRatio = null;
+        this._image.onload = onLoad.bind(this);
+        this._image.onerror = onError.bind(this);
+        this._image.onprogess = onProgress.bind(this);
+      //}
     }
     CSSImageValue.prototype = Object.create(scope.CSSImageValue.prototype);
 

test/js/css-image-value.js

@@ -24,7 +24,7 @@ suite('CSSImageValue', function() {
     assert.instanceOf(new typedOM.internal.CSSImageValue(new Image()), CSSStyleValue);
   });
 
-  test('CSSImageValue only accepts Image object', function() {
+  test('CSSImageValue only accepts Image objects', function() {
     var imageErr = /image must be an Image object/;
     assert.throws(function() { new typedOM.internal.CSSImageValue(); }, TypeError, imageErr);
     assert.throws(function() { new typedOM.internal.CSSImageValue(1); }, TypeError, imageErr);
@@ -33,7 +33,21 @@ suite('CSSImageValue', function() {
     assert.throws(function() { new typedOM.internal.CSSImageValue({ x: 1, y: 2 }); }, TypeError, imageErr);
   });
 
-  test('CSSImageValue\'s state and dimensions are correct before and after loaded', function(done) {
+  /*
+  test('Can accept an already loaded image', function(done) {
+    var image = new Image();
+    //image.src = "resources/1x1-green.png";
+    image.onload = function() {
+      var cssImageValue = new typedOM.internal.CSSImageValue(image);
+      assert.strictEqual(image.state, "loaded");
+      assert.strictEqual(image.intrinsicWidth, 1);
+      assert.strictEqual(image.intrinsicHeight, 1);
+      assert.strictEqual(image.intrinsicRatio, 1);
+      done();
+    };
+  });*/
+
+  test('State and dimensions are correct before and after loading', function(done) {
     var image = new typedOM.internal.CSSImageValue(new Image());
     assert.strictEqual(image.state, "unloaded");
     assert.strictEqual(image.intrinsicWidth, null);
@@ -44,7 +58,7 @@ suite('CSSImageValue', function() {
     image._image.onload = function() {
       oldOnload();
       assert.strictEqual(image.state, "loaded");
-      assert.strictEqual(image.intrinsicWidth, 1);
+      assert.strictEqual(image.intrinsicWidth, 2);
       assert.strictEqual(image.intrinsicHeight, 1);
       assert.strictEqual(image.intrinsicRatio, 1);
       done();