Merge pull request openlayers#370 from pagameba/overviewmap

OverviewMap custom div bug.
kochizufan · Mar 30, 2012 · 943efd6 · 943efd6
2 parents e35dfe1 + 30af95d
commit 943efd6
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/lib/OpenLayers/Control/OverviewMap.js b/lib/OpenLayers/Control/OverviewMap.js
@@ -398,8 +398,12 @@ OpenLayers.Control.OverviewMap = OpenLayers.Class(OpenLayers.Control, {
      * minimize - {Boolean} 
      */
     showToggle: function(minimize) {
-        this.maximizeDiv.style.display = minimize ? '' : 'none';
-        this.minimizeDiv.style.display = minimize ? 'none' : '';
+        if (this.maximizeDiv) {
+            this.maximizeDiv.style.display = minimize ? '' : 'none';
+        }
+        if (this.minimizeDiv) {
+            this.minimizeDiv.style.display = minimize ? 'none' : '';
+        }
     },
 
     /**

diff --git a/tests/Control/OverviewMap.html b/tests/Control/OverviewMap.html
@@ -209,6 +209,37 @@
 
         map.destroy();
     }
+
+    function test_custom_div(t) {
+        t.plan(3);
+        var div = document.createElement('div');
+
+        control = new OpenLayers.Control.OverviewMap({
+          div: div
+        });
+
+        map = new OpenLayers.Map('map', {
+            layers  : [new OpenLayers.Layer("layer", {isBaseLayer: true})],
+            controls: [control]
+        });
+
+        t.eq(control.maximizeDiv, null, 
+            "OverviewMap does not create maximize div");
+        t.eq(control.minimizeDiv, null, 
+            "OverviewMap does not create minimize div");
+
+        var exc;
+        try {
+            control.maximizeControl();
+            control.minimizeControl();
+        } catch(e) {
+            exc = e;
+        }
+
+        t.eq(exc, undefined, 'maximize and minimize do not trigger an exception');
+
+        map.destroy();
+    }
 
   </script>
 </head>