ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '2.12' of git://github.com/openlayers/openlayers

Browse Source
This commit is contained in:
Tim Schaub
2012-04-04 14:50:53 -10:00
parent 326598a75c 0554637c56
commit 24d421a449
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/style.mobile.css
View File

@@ -43,7 +43,7 @@ div.olControlZoom a:hover {
background: rgba(0, 60, 136, 0.5); background: rgba(0, 60, 136, 0.5);
} }
} }
.olLayerGridTile .olTileImage { .olLayerGrid .olTileImage {
-webkit-transition: opacity 0.2s linear; -webkit-transition: opacity 0.2s linear;
-moz-transition: opacity 0.2s linear; -moz-transition: opacity 0.2s linear;
-o-transition: opacity 0.2s linear; -o-transition: opacity 0.2s linear;

6
lib/OpenLayers/Control/CacheWrite.js
View File

@@ -173,11 +173,13 @@ OpenLayers.Control.CacheWrite = OpenLayers.Class(OpenLayers.Control, {
try { try {
var canvasContext = tile.getCanvasContext(); var canvasContext = tile.getCanvasContext();
if (canvasContext) { if (canvasContext) {
var urlMap = OpenLayers.Control.CacheWrite.urlMap;
var url = urlMap[tile.url] || tile.url;
window.localStorage.setItem( window.localStorage.setItem(
"olCache_" + OpenLayers.Control.CacheWrite.urlMap[tile.url], "olCache_" + url,
canvasContext.canvas.toDataURL(this.imageFormat) canvasContext.canvas.toDataURL(this.imageFormat)
); );
delete OpenLayers.Control.CacheWrite.urlMap[tile.url]; delete urlMap[tile.url];
} }
} catch(e) { } catch(e) {
// local storage full or CORS violation // local storage full or CORS violation

6
lib/OpenLayers/Layer/Grid.js
View File

@@ -211,14 +211,14 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
* {String} Name of the class added to the layer div. If not set in the * {String} Name of the class added to the layer div. If not set in the
* options passed to the constructor then className defaults to * options passed to the constructor then className defaults to
* "olLayerGridSingleTile" for single tile layers (see <singleTile>), * "olLayerGridSingleTile" for single tile layers (see <singleTile>),
* and "olLayerGridTile" for non single tile layers. * and "olLayerGrid" for non single tile layers.
* *
* Note: * Note:
* *
* The displaying of tiles is not animated by default for single tile * The displaying of tiles is not animated by default for single tile
* layers - OpenLayers' default theme (style.css) includes this: * layers - OpenLayers' default theme (style.css) includes this:
* (code) * (code)
* .olLayerGridTile .olTileImage { * .olLayerGrid .olTileImage {
* -webkit-transition: opacity 0.2s linear; * -webkit-transition: opacity 0.2s linear;
* -moz-transition: opacity 0.2s linear; * -moz-transition: opacity 0.2s linear;
* -o-transition: opacity 0.2s linear; * -o-transition: opacity 0.2s linear;
@@ -291,7 +291,7 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
if (this.className === null) { if (this.className === null) {
this.className = this.singleTile ? 'olLayerGridSingleTile' : this.className = this.singleTile ? 'olLayerGridSingleTile' :
'olLayerGridTile'; 'olLayerGrid';
} }
if (!OpenLayers.Animation.isNative) { if (!OpenLayers.Animation.isNative) {

2
notes/2.12.md
View File

@@ -63,7 +63,7 @@ Corresponding issues/pull requests:
The displaying of tiles can now be animated, using CSS3 transitions. Transitions operate on the `opacity` property. Here's the CSS rule defined in OpenLayers' default theme: The displaying of tiles can now be animated, using CSS3 transitions. Transitions operate on the `opacity` property. Here's the CSS rule defined in OpenLayers' default theme:
.olLayerGridTile .olTileImage { .olLayerGrid .olTileImage {
-webkit-transition: opacity 0.2s linear; -webkit-transition: opacity 0.2s linear;
-moz-transition: opacity 0.2s linear; -moz-transition: opacity 0.2s linear;
-o-transition: opacity 0.2s linear; -o-transition: opacity 0.2s linear;

6
tests/Layer/Grid.html
View File

@@ -33,7 +33,7 @@
t.eq( layer.ratio, 1.5, "ratio default is 1.5"); t.eq( layer.ratio, 1.5, "ratio default is 1.5");
t.eq( layer.numLoadingTiles, 0, "numLoadingTiles starts at 0"); t.eq( layer.numLoadingTiles, 0, "numLoadingTiles starts at 0");
t.ok( layer.tileClass === OpenLayers.Tile.Image, "tileClass default is OpenLayers.Tile.Image"); t.ok( layer.tileClass === OpenLayers.Tile.Image, "tileClass default is OpenLayers.Tile.Image");
t.eq( layer.className, 'olLayerGridTile', "className default is olLayerGridTile"); t.eq( layer.className, 'olLayerGrid', "className default is olLayerGrid");
t.eq( layer.removeBackBufferDelay, 2500, "removeBackBufferDelay default is 2500"); t.eq( layer.removeBackBufferDelay, 2500, "removeBackBufferDelay default is 2500");
var obj = {}; var obj = {};
@@ -55,8 +55,8 @@
var map = new OpenLayers.Map('map'); var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.Grid(name, url, params, null); layer = new OpenLayers.Layer.Grid(name, url, params, null);
map.addLayer(layer); map.addLayer(layer);
t.ok(OpenLayers.Element.hasClass(layer.div, "olLayerGridTile"), t.ok(OpenLayers.Element.hasClass(layer.div, "olLayerGrid"),
"olLayerGridTile class assigned to layer div"); "olLayerGrid class assigned to layer div");
map.destroy(); map.destroy();
} }

2
theme/default/style.css
View File

@@ -476,7 +476,7 @@ a.olControlZoomOut {
* Animations * Animations
*/ */
.olLayerGridTile .olTileImage { .olLayerGrid .olTileImage {
-webkit-transition: opacity 0.2s linear; -webkit-transition: opacity 0.2s linear;
-moz-transition: opacity 0.2s linear; -moz-transition: opacity 0.2s linear;
-o-transition: opacity 0.2s linear; -o-transition: opacity 0.2s linear;