set VERSION_NUMBER to 2.13 final

Whenever we run tests *with* the tileManager, we cannot inspect any grid...(r=@ahocevar)

build/mobile.cfg

@@ -29,6 +29,7 @@ OpenLayers/Protocol/HTTP.js
 OpenLayers/Protocol/WFS.js
 OpenLayers/Protocol/WFS/v1_0_0.js
 OpenLayers/Strategy/Fixed.js
+OpenLayers/TileManager.js
 
 [exclude]
 

lib/OpenLayers.js

@@ -426,4 +426,4 @@
  * When asking questions or reporting issues, make sure to include the output of
  *     OpenLayers.VERSION_NUMBER in the question or issue-description.
  */
-OpenLayers.VERSION_NUMBER="Release 2.13-rc6";
+OpenLayers.VERSION_NUMBER="Release 2.13";

lib/OpenLayers/Layer.js

@@ -743,6 +743,12 @@ OpenLayers.Layer = OpenLayers.Class({
             this.visibility = visibility;
             this.display(visibility);
             this.redraw();
+            if (this.map != null) {
+                this.map.events.triggerEvent("changelayer", {
+                    layer: this,
+                    property: "visibility"
+                });
+            }
             this.events.triggerEvent("visibilitychanged");
         }
     },
@@ -759,11 +765,6 @@ OpenLayers.Layer = OpenLayers.Class({
     display: function(display) {
         if (display != (this.div.style.display != "none")) {
             this.div.style.display = (display && this.calculateInRange()) ? "block" : "none";
-            if(this.map){
-                this.map.events.triggerEvent("changelayer", {
-                    layer: this, property: "visibility"
-                });
-            }
         }
     },
 

lib/OpenLayers/Map.js

@@ -10,7 +10,6 @@
  * @requires OpenLayers/Events.js
  * @requires OpenLayers/Tween.js
  * @requires OpenLayers/Projection.js
- * @requires OpenLayers/TileManager.js
  */
 
 /**
@@ -376,11 +375,12 @@ OpenLayers.Map = OpenLayers.Class({
 
     /**
      * APIProperty: tileManager
-     * {<OpenLayers.TileManager>|Object} By default the map will use the TileManager
+     * {<OpenLayers.TileManager>|Object} By default, and if the build contains
-     * to queue image requests and to cache tile image elements. To create a
+     * TileManager.js, the map will use the TileManager to queue image requests
-     * map without a TileManager configure the map with tileManager: null.
+     * and to cache tile image elements. To create a map without a TileManager
-     * To create a TileManager with non-default options, supply the options
+     * configure the map with tileManager: null. To create a TileManager with
-     * instead or alternatively supply an instance of {<OpenLayers.TileManager>}.
+     * non-default options, supply the options instead or alternatively supply
+     * an instance of {<OpenLayers.TileManager>}.
      */
 
     /**
@@ -614,7 +614,7 @@ OpenLayers.Map = OpenLayers.Class({
             {includeXY: true}
         );
         
-        if (this.tileManager !== null) {
+        if (OpenLayers.TileManager && this.tileManager !== null) {
             if (!(this.tileManager instanceof OpenLayers.TileManager)) {
                 this.tileManager = new OpenLayers.TileManager(this.tileManager);
             }
@@ -2038,7 +2038,9 @@ OpenLayers.Map = OpenLayers.Class({
                         if (!inRange) {
                             layer.display(false);
                         }
-
+                        this.events.triggerEvent("changelayer", {
+                            layer: layer, property: "visibility"
+                        });
                     }
                     if (inRange && layer.visibility) {
                         layer.moveTo(bounds, zoomChanged, options.dragging);

lib/OpenLayers/SingleFile.js

@@ -7,7 +7,7 @@ var OpenLayers = {
     /**
      * Constant: VERSION_NUMBER
      */
-    VERSION_NUMBER: "Release 2.13-rc6",
+    VERSION_NUMBER: "Release 2.13",
 
     /**
      * Constant: singleFile

lib/OpenLayers/TileManager.js

@@ -5,7 +5,6 @@
 
 
 /**
- * @requires OpenLayers/Layer/Grid.js
  * @requires OpenLayers/Util.js
  * @requires OpenLayers/BaseTypes.js
  * @requires OpenLayers/BaseTypes/Element.js
@@ -117,7 +116,7 @@ OpenLayers.TileManager = OpenLayers.Class({
      * map - {<OpenLayers.Map>}
      */
     addMap: function(map) {
-        if (this._destroyed) {
+        if (this._destroyed || !OpenLayers.Layer.Grid) {
             return;
         }
         this.maps.push(map);
@@ -143,7 +142,7 @@ OpenLayers.TileManager = OpenLayers.Class({
      * map - {<OpenLayers.Map>}
      */
     removeMap: function(map) {
-        if (this._destroyed) {
+        if (this._destroyed || !OpenLayers.Layer.Grid) {
             return;
         }
         window.clearTimeout(this.tileQueueId[map.id]);

tests/Layer.html

@@ -858,44 +858,6 @@
              "setOpacity() does not trigger changelayer if the opacity value is the same");
     }
 
-    function test_display(t) {
-        t.plan(9);
-
-        var map, layer, log;
-
-        map = new OpenLayers.Map("map");
-        layer = new OpenLayers.Layer("", {
-            alwaysInRange: true,
-            visibility: true
-        });
-        map.addLayer(layer);
-
-        log = [];
-        map.events.register('changelayer', t, function(event) {
-            log.push({
-                layer: event.layer,
-                property: event.property
-            });
-        });
-        layer.display(false);
-        t.eq(layer.div.style.display, "none", "display() set layer's display style to correct value");
-        t.eq(layer.getVisibility(), true, "display() does not affect layer's visibility state");
-        t.eq(log.length, 1, "display() triggers changelayer once");
-        t.ok(log[0].layer == layer, "changelayer listener called with expected layer");
-        t.eq(log[0].property, "visibility", "changelayer listener called with expected property");
-        layer.visibility = false;
-        layer.display(true);
-        t.eq(layer.div.style.display, "block", "display() set layer's display style to correct value");
-        t.eq(layer.getVisibility(), false, "display() does not affect layer's visibility state");
-        layer.setVisibility(true);
-
-        // This call must not trig the event because the opacity value is the same.
-        log = [];
-        layer.display(true);
-        t.eq(log.length, 0, "display() does not trigger changelayer if the display value is the same");
-        layer.setVisibility(false);
-        t.eq(log.length, 1, "changelayer event called only once. setVisibility doesn't fire any extra changelayer events");
-    }
 
 /******
  * 

tests/Layer/Grid.html

@@ -682,7 +682,7 @@
 
         t.plan( 9 );
 
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         layer = new OpenLayers.Layer.Grid(name, url, params);
         map.addLayer(layer);
         layer.destroy();

tests/Map.html

@@ -984,22 +984,14 @@
     }
 
     function test_Map_moveTo(t) {
-        t.plan(12);
+        t.plan(2);
 
         map = new OpenLayers.Map('map');
         var baseLayer = new OpenLayers.Layer.WMS("Test Layer", 
             "http://octo.metacarta.com/cgi-bin/mapserv?",
             {map: "/mapdata/vmap_wms.map", layers: "basic"},
             {maxResolution: 'auto', maxExtent: new OpenLayers.Bounds(-10,-10,10,10)});
-        var testLayer = new OpenLayers.Layer("",{maxResolution: 0.1, minResolution: 0.03, isBaseLayer: false, visibility: true});
+        baseLayer.events.on({
-        var log = [];
-        map.events.register('changelayer', t, function(event) {
-            log.push({
-                layer: event.layer,
-                property: event.property
-            });
-        });
-        map.events.on({
             move: function() {
                 t.ok(true, "move listener called");
             },
@@ -1013,19 +1005,9 @@
             }
         });
         map.addLayer(baseLayer);
-        map.addLayer(testLayer);
-        log = [];
         var ll = new OpenLayers.LonLat(-100,-150);
         map.moveTo(ll, 2);
-        
         t.ok(map.getCenter().equals(new OpenLayers.LonLat(0,0)), "safely sets out-of-bounds lonlat");
-        t.eq(testLayer.div.style.display, "none", "moveTo out of resolution range set layer's display style to correct value");
-        t.eq(log.length, 1, "Map.moveTo out of resolution range triggers changelayer once");
-        t.ok(log[0].layer == testLayer, "changelayer listener called with expected layer");
-        t.eq(log[0].property, "visibility", "changelayer listener called with expected property");
-
-        map.moveTo(new OpenLayers.LonLat(0,0), 0);
-        t.eq(testLayer.div.style.display, "block", "moveTo in to resolution range set layer's display style to correct value");
 
         map.destroy();
     }

tests/Tile/Image.html

@@ -282,7 +282,7 @@
                        format: 'image/png'};
 
 
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         var layer = new OpenLayers.Layer.WMS(name, url, params, {gutter: gutter});
         map.addLayer(layer);
         map.setCenter(new OpenLayers.LonLat(0,0), 5);
@@ -296,7 +296,7 @@
         map.destroy();
         
         var gutter = 15;
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         var layer = new OpenLayers.Layer.WMS(name, url, params, {gutter: gutter});
         map.addLayer(layer);
         map.setCenter(new OpenLayers.LonLat(0,0), 5);
@@ -320,7 +320,7 @@
     function test_createBackBuffer(t) {
         t.plan(3);
 
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
             "../../img/blank.gif", {layers: 'basic'});
         map.addLayer(layer);
@@ -345,7 +345,7 @@
     function test_onImageLoad(t) {
         t.plan(3);
 
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
             "../../img/blank.gif", {layers: 'basic'}, {opacity: 0.5});
         map.addLayer(layer);

tests/deprecated/Layer/MapServer.html

@@ -23,7 +23,7 @@
             t.debug_print("Can't test google reprojection in Opera or Safari.");
         } else if(validkey) {
             t.plan(5);
-            var map = new OpenLayers.Map('map');
+            var map = new OpenLayers.Map('map', {tileManager: null});
             var layer = new OpenLayers.Layer.Google("Google");
             map.addLayer(layer);
             layer = new OpenLayers.Layer.MapServer(name, url, params, {reproject: true, isBaseLayer: false, buffer: 2});
@@ -42,7 +42,7 @@
                           window.location.host);
         }
 
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         layer = new OpenLayers.Layer.MapServer(name, url, params, {buffer:2});
         map.addLayer(layer);
         map.setCenter(new OpenLayers.LonLat(0,0), 5);

tests/deprecated/Layer/WMS.html

@@ -23,7 +23,7 @@
         } else if(validkey) {
             t.plan(5);
 
-            var map = new OpenLayers.Map('map');
+            var map = new OpenLayers.Map('map', {tileManager: null});
             var layer = new OpenLayers.Layer.Google("Google");
             map.addLayer(layer);
             var wmslayer = new OpenLayers.Layer.WMS(name, url, params,
@@ -43,7 +43,7 @@
                           window.location.host);
         }
 
-        var map = new OpenLayers.Map('map');
+        var map = new OpenLayers.Map('map', {tileManager: null});
         layer = new OpenLayers.Layer.WMS(name, url, params, {buffer: 2});
         map.addLayer(layer);
         map.setCenter(new OpenLayers.LonLat(0,0), 5);

tests/list-tests.html

@@ -231,7 +231,7 @@
     <li>Tile/Image.html</li>
     <li>Tile/Image/IFrame.html</li>
     <li>Tile/UTFGrid.html</li>
-    <li>TileManager.html</li>
+    <li>TileManager.html?visible</li>
     <li>Tween.html</li>
     <li>Kinetic.html</li>
     <li>Util.html?visible</li>