diff --git a/examples/img/popupMatrix.jpg b/examples/img/popupMatrix.jpg
index fb09bc0717..0f67368aa7 100644
Binary files a/examples/img/popupMatrix.jpg and b/examples/img/popupMatrix.jpg differ
diff --git a/examples/popupMatrix.html b/examples/popupMatrix.html
index 90b5fc02e3..213f580420 100644
--- a/examples/popupMatrix.html
+++ b/examples/popupMatrix.html
@@ -44,22 +44,6 @@
'maxSize': new OpenLayers.Size(100,100)
});
- //anchoredbubble
-
- AutoSizeAnchoredBubble = OpenLayers.Class(OpenLayers.Popup.AnchoredBubble, {
- 'autoSize': true
- });
-
- AutoSizeAnchoredBubbleMinSize = OpenLayers.Class(OpenLayers.Popup.AnchoredBubble, {
- 'autoSize': true,
- 'minSize': new OpenLayers.Size(400,400)
- });
-
- AutoSizeAnchoredBubbleMaxSize = OpenLayers.Class(OpenLayers.Popup.AnchoredBubble, {
- 'autoSize': true,
- 'maxSize': new OpenLayers.Size(100,100)
- });
-
//framed
//disable the autosize for the purpose of our matrix
@@ -342,247 +326,6 @@
popupContentHTML = '';
addMarker(ll, popupClass, popupContentHTML, true, true);
-
- //
- //Bubble NO OVERFLOW
- //
-
- //anchored bubble popup small contents no autosize
- var ll = new OpenLayers.LonLat(-55,5);
- popupClass = OpenLayers.Popup.AnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, false);
-
- //anchored bubble popup small contents no autosize closebox
- var ll = new OpenLayers.LonLat(-50,5);
- popupClass = OpenLayers.Popup.AnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true);
-
-
- //anchored bubble popup small contents autosize
- ll = new OpenLayers.LonLat(-40,5);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, false);
-
- //anchored bubble popup small contents autosize closebox
- ll = new OpenLayers.LonLat(-35,5);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true);
-
-
- //anchored bubble popup small contents autosize minsize
- ll = new OpenLayers.LonLat(-25,5);
- popupClass = AutoSizeAnchoredBubbleMinSize;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, false);
-
- //anchored bubble popup small contents autosize minsize closebox
- ll = new OpenLayers.LonLat(-20,5);
- popupClass = AutoSizeAnchoredBubbleMinSize;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true);
-
-
- //anchored bubble popup small contents autosize maxsize
- ll = new OpenLayers.LonLat(-10,5);
- popupClass = AutoSizeAnchoredBubbleMaxSize;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, false);
-
- //anchored bubble popup small contents autosize maxsize closebox
- ll = new OpenLayers.LonLat(-5,5);
- popupClass = AutoSizeAnchoredBubbleMaxSize;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true);
-
-
- //anchored bubble popup bigger contents autosize closebox
- ll = new OpenLayers.LonLat(5,5);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '
Popup.AnchoredBubble
autosize
' + samplePopupContentsHTML + '
';
- addMarker(ll, popupClass, popupContentHTML, false);
-
- //anchored bubble popup bigger contents autosize closebox
- ll = new OpenLayers.LonLat(10,5);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = 'Popup.AnchoredBubble
autosize
closebox
' + samplePopupContentsHTML + '
';
- addMarker(ll, popupClass, popupContentHTML, true);
-
-
- //anchored bubble popup wide short text contents autosize
- ll = new OpenLayers.LonLat(20,5);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = 'Popup.AnchoredBubble
autosize - wide short text
' + samplePopupContentsHTML_WideShort + '
';
- addMarker(ll, popupClass, popupContentHTML);
-
- //anchored bubble popup wide short text contents autosize closebox
- ll = new OpenLayers.LonLat(25,5);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = 'Popup.AnchoredBubble
autosize - wide short text
closebox
' + samplePopupContentsHTML_WideShort + '
';
- addMarker(ll, popupClass, popupContentHTML, true);
-
-
- //anchored bubble popup wide short fixed contents autosize
- ll = new OpenLayers.LonLat(35,5);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML);
-
- //anchored bubble popup wide short fixed contents autosize closebox
- ll = new OpenLayers.LonLat(40,5);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true);
-
-
- //anchored bubble popup thin long fixed contents autosize
- ll = new OpenLayers.LonLat(50,5);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML);
-
- //anchored bubble popup thin long fixed contents autosize closebox
- ll = new OpenLayers.LonLat(55,5);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true);
-
-
- //anchored bubble popup wide long fixed contents autosize
- ll = new OpenLayers.LonLat(65,5);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML);
-
- //anchored bubble popup wide long fixed contents autosize closebox
- ll = new OpenLayers.LonLat(70,5);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true);
-
- //
- //Bubble OVERFLOW
- //
-
- //anchored bubble popup small contents no autosize
- var ll = new OpenLayers.LonLat(-55,0);
- popupClass = OpenLayers.Popup.AnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, false, true);
-
- //anchored bubble popup small contents no autosize closebox
- var ll = new OpenLayers.LonLat(-50,0);
- popupClass = OpenLayers.Popup.AnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true, true);
-
-
- //anchored bubble popup small contents autosize
- ll = new OpenLayers.LonLat(-40,0);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, false, true);
-
- //anchored bubble popup small contents autosize closebox
- ll = new OpenLayers.LonLat(-35,0);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true, true);
-
-
- //anchored bubble popup small contents autosize minsize
- ll = new OpenLayers.LonLat(-25,0);
- popupClass = AutoSizeAnchoredBubbleMinSize;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, false, true);
-
- //anchored bubble popup small contents autosize minsize closebox
- ll = new OpenLayers.LonLat(-20,0);
- popupClass = AutoSizeAnchoredBubbleMinSize;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true, true);
-
-
- //anchored bubble popup small contents autosize maxsize
- ll = new OpenLayers.LonLat(-10,0);
- popupClass = AutoSizeAnchoredBubbleMaxSize;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, false, true);
-
- //anchored bubble popup small contents autosize maxsize closebox
- ll = new OpenLayers.LonLat(-5,0);
- popupClass = AutoSizeAnchoredBubbleMaxSize;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true, true);
-
-
- //anchored bubble popup bigger contents autosize closebox
- ll = new OpenLayers.LonLat(5,0);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = 'Popup.AnchoredBubble
autosize
overflow
' + samplePopupContentsHTML + '
';
- addMarker(ll, popupClass, popupContentHTML, false, true);
-
- //anchored bubble popup bigger contents autosize closebox
- ll = new OpenLayers.LonLat(10,0);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = 'Popup.AnchoredBubble
autosize
closebox
overflow
' + samplePopupContentsHTML + '
';
- addMarker(ll, popupClass, popupContentHTML, true, true);
-
-
- //anchored bubble popup wide short contents autosize overflow
- ll = new OpenLayers.LonLat(20,0);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = 'Popup.AnchoredBubble
autosize
overflow
' + samplePopupContentsHTML_WideShort + '
';
- addMarker(ll, popupClass, popupContentHTML, false, true);
-
- //anchored bubble popup wide short contents autosize closebox overflow
- ll = new OpenLayers.LonLat(25,0);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = 'Popup.AnchoredBubble
autosize
overflow
closebox
' + samplePopupContentsHTML_WideShort + '
';
- addMarker(ll, popupClass, popupContentHTML, true, true);
-
-
- //anchored bubble popup wide short fixed contents autosize overflow
- ll = new OpenLayers.LonLat(35,0);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, false, true);
-
- //anchored bubble popup wide short fixed contents autosize closebox overflow
- ll = new OpenLayers.LonLat(40,0);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true, true);
-
-
- //anchored bubble popup thin long fixed contents autosize overflow
- ll = new OpenLayers.LonLat(50,0);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, false, true);
-
- //anchored bubble popup thin long fixed contents autosize closebox overflow
- ll = new OpenLayers.LonLat(55,0);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true, true);
-
-
- //anchored bubble popup wide long fixed contents autosize overflow
- ll = new OpenLayers.LonLat(65,0);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, false, true);
-
- //anchored bubble popup wide long fixed contents autosize closebox overflow
- ll = new OpenLayers.LonLat(70,0);
- popupClass = AutoSizeAnchoredBubble;
- popupContentHTML = '';
- addMarker(ll, popupClass, popupContentHTML, true, true);
-
//FRAMED
//