Merge pull request #705 from ahocevar/animation

Remove complexity from the image loading sequence. r=@elemoine,@tschaub
2012-11-05 10:33:59 -08:00
parent b45f903198 5a3bcc716b
commit a54ecca32b
5 changed files with 38 additions and 55 deletions
--- a/tests/Layer/Grid.html
+++ b/tests/Layer/Grid.html
@@ -770,7 +770,6 @@
    }

    function test_setOpacity(t) {
-
        t.plan(5);

        var map = new OpenLayers.Map('map');
@@ -1309,7 +1308,6 @@
    }

    function test_delayed_back_buffer_removal(t) {
-
        //
        // Test that the delaying of the back buffer removal behaves
        // as expected.
--- a/tests/Tile/Image.html
+++ b/tests/Tile/Image.html
@@ -2,7 +2,7 @@
 <head>
  <script src="../OLLoader.js"></script>
  <script type="text/javascript">
-    // turn off animation frame handling, so we can check img urls in tests
+    // turn off tile queue, so we can check img urls in tests
    delete OpenLayers.Layer.Grid.prototype.queueTileDraw;

    var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
--- a/tests/Tile/Image/IFrame.html
+++ b/tests/Tile/Image/IFrame.html
@@ -96,7 +96,7 @@
        var eventPane = tile.frame.childNodes[0];

        t.ok(OpenLayers.String.contains(eventPane.style.backgroundImage,
-                    tile._blankImageUrl),
+                    tile.blankImageUrl),
             "backgroundImage of eventPane is set.");
        t.eq(parseInt(eventPane.style.zIndex, 10), 1, "zIndex of eventPane is set.");
        if(isIElt9) {