Skip to content

Commit

Permalink
Don't use canvas when not needed
Browse files Browse the repository at this point in the history
  • Loading branch information
makeable committed Oct 26, 2011
1 parent bad8ebe commit 2173d3d
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions notificon.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ or implied, of Matt Williams.
}
};

var changeFavicon = function changeFavicon(canvas) {
var changeFavicon = function changeFavicon(uri) {
var link = document.createElement('link');
link.type = 'image/x-icon';
link.rel = 'icon notificon';
link.href = canvas.toDataURL("image/png");
link.href = uri;
removeNotificon();
document.getElementsByTagName('head')[0].appendChild(link);
};
Expand Down Expand Up @@ -126,6 +126,10 @@ or implied, of Matt Williams.
}

var options = mergeDefaultOptions(myOptions);

if (!label.length) {
return changeFavicon(options.favicon);
}

var img = document.createElement("img");
img.src = options.favicon;
Expand All @@ -135,8 +139,7 @@ or implied, of Matt Williams.
drawLabel(canvas, label, options.color, options.stroke);
}
try {
changeFavicon(canvas);
return true;
return changeFavicon(canvas.toDataURL("image/png"));
} catch(e) {
if (console) {
console.log('Notificon: cannot use icons located on a different domain (' + favicon + ')');
Expand Down

0 comments on commit 2173d3d

Please sign in to comment.