Merge branch 'master' into tile-fade-in

Conflicts: tests/Tile/Image.html
2012-01-17 09:27:55 +01:00
parent d3db3011a3 0aaa5265b4
commit 99ca32540d
95 changed files with 818 additions and 246 deletions
@@ -65,7 +65,7 @@
    }

    function test_Layer_HTTPRequest_mergeNewParams (t) {
-        t.plan( 8 );
+        t.plan( 9 );

        var map = new OpenLayers.Map('map');
        layer = new OpenLayers.Layer.HTTPRequest(name, url, params, options);
@@ -97,7 +97,9 @@
        
        layer.redraw = function() {
            t.ok(true, "layer.mergeNewParams calls layer.redraw");
-        }
+            t.ok(layer.resolution === null, "layer.mergeNewParams sets resolution to null");
+        };
+        layer.resolution = 'fake';
        layer.mergeNewParams();
    }