refactoring

src/Core.js

@@ -146,21 +146,9 @@ _html2canvas.Util.getCSS = function (el, attribute) {
         }
       }
     }
-
-
-
   }
 
-
-
-
   return val;
-
-
-
-//return $(el).css(attribute);
-
-
 };
 
 
@@ -182,32 +170,24 @@ _html2canvas.Util.BackgroundPosition = function ( el, bounds, image ) {
     bgposition[1] = val;
   }
 
-
-
   if (bgposition[0].toString().indexOf("%") !== -1){
     percentage = (parseFloat(bgposition[0])/100);
     left =  ((bounds.width * percentage)-(image.width*percentage));
-
   } else {
     left = parseInt(bgposition[0],10);
   }
 
   if (bgposition[1].toString().indexOf("%") !== -1){
-
     percentage = (parseFloat(bgposition[1])/100);
     topPos =  ((bounds.height * percentage)-(image.height*percentage));
   } else {
     topPos = parseInt(bgposition[1],10);
   }
 
-
-
-
   return {
     top: topPos,
     left: left
   };
-
 };
 
 _html2canvas.Util.Extend = function (options, defaults) {

src/Renderer.js

@@ -1,58 +1,49 @@
 _html2canvas.Renderer = function(parseQueue, options){
-  var queue = [], renderer;
 
-  function sortZ(zStack){
+  function createRenderQueue(parseQueue) {
+    var queue = [];
+
+    var sortZ = function(zStack){
       var subStacks = [],
-    stackValues = [],
+      stackValues = [];
-    zStackChildren = zStack.children,
-    s,
-    i,
-    stackLen,
-    zValue,
-    zLen,
-    stackChild,
-    b,
-    subStackLen;
-
-
-    for (s = 0, zLen = zStackChildren.length; s < zLen; s+=1){
-
-      stackChild = zStackChildren[s];
 
+      zStack.children.forEach(function(stackChild) {
         if (stackChild.children && stackChild.children.length > 0){
           subStacks.push(stackChild);
           stackValues.push(stackChild.zindex);
         } else {
           queue.push(stackChild);
         }
-
+      });
-    }
 
       stackValues.sort(function(a, b) {
         return a - b;
       });
 
-    for (i = 0, stackLen = stackValues.length; i < stackLen; i+=1){
+      stackValues.forEach(function(zValue) {
-      zValue = stackValues[i];
+        var index;
-      for (b = 0, subStackLen = subStacks.length; b <= subStackLen; b+=1){
         
-        if (subStacks[b].zindex === zValue){
+        subStacks.some(function(stack, i){
-          stackChild = subStacks.splice(b, 1);
+          index = i;
-          sortZ(stackChild[0]);
+          return (stack.zindex === zValue);
-          break;
+        });
+        sortZ(subStacks.splice(index, 1)[0]);
 
-        }
+      });
-      }
+    };
-    }
-
-  }
 
     sortZ(parseQueue.zIndex);
 
-  if (typeof options.renderer === "string" && _html2canvas.Renderer[options.renderer] !== undefined) {
+    return queue;
-    renderer = _html2canvas.Renderer[options.renderer](options);
+  }
-  } else if (typeof options.renderer === "function") {
+
-    renderer = options.renderer(options);
+  function getRenderer(rendererName) {
+    var renderer;
+
+    if (typeof options.renderer === "string" && _html2canvas.Renderer[rendererName] !== undefined) {
+      renderer = _html2canvas.Renderer[rendererName](options);
+    } else if (typeof rendererName === "function") {
+      renderer = rendererName(options);
     } else {
       throw new Error("Unknown renderer");
     }
@@ -60,7 +51,8 @@ _html2canvas.Renderer = function(parseQueue, options){
     if ( typeof renderer._create !== "function" ) {
       throw new Error("Invalid renderer defined");
     }
+    return renderer;
+  }
 
-  return renderer._create( parseQueue, options, document, queue, _html2canvas );
+  return getRenderer(options.renderer)._create(parseQueue, options, document, createRenderQueue(parseQueue), _html2canvas);
-
 };