Safari works now - Uint8ClampedArray constructor

Uint8ClampedArray.constructor.name is Uint8Array or Array when the shiv is in effect. Almost there, IE!
lhl · Oct 25, 2013 · c293d63 · c293d63
1 parent 48bfdab
commit c293d63
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/data.js b/data.js
@@ -1,6 +1,6 @@
 /* Data.js */
 // A few functions to store and display ~persistent data
-"use strict";
+// "use strict";
 
 // window.data stores the references to data and elements
 function resetData() {

diff --git a/mario.js b/mario.js
@@ -32,8 +32,11 @@ function FullScreenMario() {
                            || window.msCancelRequestAnimationFrame
                            || clearTimeout;
 
-  // THANKS INTERNET EXPLORER
-  if(!window.Uint8ClampedArray) window.Uint8ClampedArray = Array;
+  window.Uint8ClampedArray = window.Uint8ClampedArray
+                          || window.Uint8Array
+                          || Array;
+  // Because the shiv will mess this up for sprites.js detection                          
+  window.Uint8ArrayName = Uint8ClampedArray.name || "Uint8Array"; // ie
 
   // Resetting everything may take a while
   resetMeasurements();

diff --git a/sprites.js b/sprites.js
@@ -179,7 +179,7 @@ function getSpriteFromLibrary(thing) {
       return;
     }
     // If it's more complicated, search for it
-    if(sprite.constructor != Uint8ClampedArray) {
+    if(sprite.constructor.name != Uint8ArrayName) {
       sprite = findSpriteInLibrary(thing, sprite, classes);
     }
 
@@ -246,7 +246,7 @@ function expandObtainedSpriteMultiple(sprites, thing, width, height) {
   // Expand each array from the multiple sprites to parsed
   for(part in sprites) {
     // If it's an actual sprite array, parse it
-    if((sprite = sprites[part]) instanceof Uint8ClampedArray) {
+    if((sprite = sprites[part]).constructor.name == Uint8ArrayName) {
       ++thing.num_sprites;
       parsed[part] = expandObtainedSprite(sprite, thing, width, height, true);
     }
@@ -295,7 +295,7 @@ function findSpriteInLibrary(thing, current, classes) {
         nogood = false;
         switch(check.constructor.name) {
           // If it's a sprite array, you've found it.
-          case "Uint8ClampedArray":  case "SpriteMultiple":
+          case Uint8ArrayName:  case "SpriteMultiple":
             return check;
           // If it's an object, recurse normally
           case "Object": 
@@ -312,7 +312,7 @@ function findSpriteInLibrary(thing, current, classes) {
     if(!nogood && current) {
       switch(current.constructor.name) {
         // You did it!
-        case "Uint8ClampedArray": case "SpriteMultiple": return current;
+        case Uint8ArrayName: case "SpriteMultiple": return current;
         // Keep going
         case "Object": 
           continue;