Permalink
Browse files

Merge pull request #51 from PhilHarnish/optionalCrossOrigin

Optionally set crossOrigin = 'anonymous'
  • Loading branch information...
2 parents 7f191dc + 4c42db4 commit 31d49da923c812101088a4029847909461b41397 @tommoor committed Oct 11, 2013
Showing with 2 additions and 1 deletion.
  1. +2 −1 tinycon.js
View
@@ -24,6 +24,7 @@
colour: '#ffffff',
background: '#F03D25',
fallback: true,
+ crossOrigin: true,
abbreviate: true
};
@@ -134,7 +135,7 @@
// allow cross origin resource requests if the image is not a data:uri
// as detailed here: https://github.com/mrdoob/three.js/issues/1305
- if (!src.match(/^data/)) {
+ if (!src.match(/^data/) && options.crossOrigin) {
faviconImage.crossOrigin = 'anonymous';
}

0 comments on commit 31d49da

Please sign in to comment.