Merge branch 'master' into tile-fade-in
Conflicts: examples/fullScreen.js
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for
|
||||
/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for
|
||||
* full list of contributors). Published under the Clear BSD license.
|
||||
* See http://svn.openlayers.org/trunk/openlayers/license.txt for the
|
||||
* full text of the license. */
|
||||
@@ -50,6 +50,13 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
|
||||
* created by this Layer, if supported by the tile class.
|
||||
*/
|
||||
tileOptions: null,
|
||||
|
||||
/**
|
||||
* APIProperty: tileClass
|
||||
* {<OpenLayers.Tile>} The tile class to use for this layer.
|
||||
* Defaults is OpenLayers.Tile.Image.
|
||||
*/
|
||||
tileClass: OpenLayers.Tile.Image,
|
||||
|
||||
/**
|
||||
* Property: grid
|
||||
@@ -918,9 +925,9 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
|
||||
* Returns:
|
||||
* {<OpenLayers.Tile>} The added OpenLayers.Tile
|
||||
*/
|
||||
addTile:function(bounds, position) {
|
||||
return new OpenLayers.Tile.Image(this, position, bounds, null,
|
||||
this.tileSize, this.tileOptions);
|
||||
addTile: function(bounds, position) {
|
||||
return new this.tileClass(this, position, bounds, null,
|
||||
this.tileSize, this.tileOptions);
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user