Skip to content
Browse files

Merge branch 'master' of github.com:Automattic/canvas-fireworks

  • Loading branch information...
2 parents f2612af + a5b0e41 commit 7604fe389134387d667d4c2fa42b70405b04b98b @skeltoac skeltoac committed
Showing with 3 additions and 2 deletions.
  1. +3 −2 js/canvas.js
View
5 js/canvas.js
@@ -20,6 +20,7 @@
var defaults = {
debug : true,
+ baseHref : "",
frameRateMin : 12.5,
frameRateMax : 20,
frameInterval : 50, // ms between rendered frames
@@ -244,7 +245,7 @@
$.each(this.sprites, function(name, url) {
++self.loading;
var img = new Image();
- img.src = url;
+ img.src = self.baseHref + url;
img.onload = function() {
if ( typeof self.imgs[name] != "object" )
self.imgs[name] = [];
@@ -255,7 +256,7 @@
$.each(this.rasters, function(name, url) {
++self.loading;
self.rasters[name] = new Image();
- self.rasters[name].src = url;
+ self.rasters[name].src = self.baseHref + url;
self.rasters[name].onload = function() {
--self.loading;
};

0 comments on commit 7604fe3

Please sign in to comment.
Something went wrong with that request. Please try again.