Make cross origin 'anonymous' by default

This commit is contained in:
Tom Payne
2012-07-24 15:16:59 +02:00
parent b1012b5b86
commit 042434bc54
3 changed files with 9 additions and 10 deletions
+1 -3
View File
@@ -20,8 +20,6 @@ ol.tilelayer.createOpenStreetMap = function(opt_values) {
'© ' + '© ' +
'<a href="http://www.openstreetmap.org">OpenStreetMap</a> ' + '<a href="http://www.openstreetmap.org">OpenStreetMap</a> ' +
'contributors, ' + 'contributors, ' +
'<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC BY-SA</a>', '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC BY-SA</a>');
''
);
return new ol.TileLayer(store, opt_values); return new ol.TileLayer(store, opt_values);
}; };
+4 -4
View File
@@ -24,9 +24,9 @@ ol.TileLoadState = {
* @extends {goog.events.EventTarget} * @extends {goog.events.EventTarget}
* @param {ol.TileCoord} tileCoord Tile coordinate. * @param {ol.TileCoord} tileCoord Tile coordinate.
* @param {string} src Source. * @param {string} src Source.
* @param {string=} opt_crossOrigin Cross origin. * @param {?string} crossOrigin Cross origin.
*/ */
ol.Tile = function(tileCoord, src, opt_crossOrigin) { ol.Tile = function(tileCoord, src, crossOrigin) {
goog.base(this); goog.base(this);
@@ -52,8 +52,8 @@ ol.Tile = function(tileCoord, src, opt_crossOrigin) {
* @type {Image} * @type {Image}
*/ */
this.image_ = new Image(); this.image_ = new Image();
if (goog.isDef(opt_crossOrigin)) { if (!goog.isNull(crossOrigin)) {
this.image_.crossOrigin = opt_crossOrigin; this.image_.crossOrigin = crossOrigin;
} }
/** /**
+4 -3
View File
@@ -16,7 +16,7 @@ goog.require('ol.TileUrlFunctionType');
* @param {ol.TileUrlFunctionType} tileUrlFunction Tile URL. * @param {ol.TileUrlFunctionType} tileUrlFunction Tile URL.
* @param {ol.Extent=} opt_extent Extent. * @param {ol.Extent=} opt_extent Extent.
* @param {string=} opt_attribution Attribution. * @param {string=} opt_attribution Attribution.
* @param {string=} opt_crossOrigin Cross origin. * @param {?string=} opt_crossOrigin Cross origin.
*/ */
ol.TileStore = function(projection, tileGrid, tileUrlFunction, opt_extent, ol.TileStore = function(projection, tileGrid, tileUrlFunction, opt_extent,
opt_attribution, opt_crossOrigin) { opt_attribution, opt_crossOrigin) {
@@ -37,9 +37,10 @@ ol.TileStore = function(projection, tileGrid, tileUrlFunction, opt_extent,
/** /**
* @private * @private
* @type {string|undefined} * @type {?string}
*/ */
this.crossOrigin_ = opt_crossOrigin; this.crossOrigin_ =
goog.isDef(opt_crossOrigin) ? opt_crossOrigin : 'anonymous';
/** /**
* @private * @private