[Commits] r418 - in sandbox/opengeo/geoexplorer: . lib/GeoExt/widgets tests/lib/GeoExt/widgets

[commits at geoext.org]

Author: tschaub
Date: 2009-04-18 00:08:51 +0200 (Sat, 18 Apr 2009)
New Revision: 418

Modified:
   sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/Popup.js
   sandbox/opengeo/geoexplorer/modifications.txt
   sandbox/opengeo/geoexplorer/tests/lib/GeoExt/widgets/Popup.html
Log:
Avoid name conflict when popup is in container with anchor layout - patch for #44.

Modified: sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/Popup.js
===================================================================
--- sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/Popup.js	2009-04-17 21:58:57 UTC (rev 417)
+++ sandbox/opengeo/geoexplorer/lib/GeoExt/widgets/Popup.js	2009-04-17 22:08:51 UTC (rev 418)
@@ -153,7 +153,7 @@
         if(this.unpinnable) {
             this.addTool({
                 id: 'unpin',
-                handler: this.unanchor.createDelegate(this, [])
+                handler: this.unanchorPopup.createDelegate(this, [])
             });
         }
 
@@ -181,7 +181,7 @@
 
         /* Anchoring */
         if(this.anchored) {
-            this.anchor();
+            this.anchorPopup();
         }
 
         this.show();
@@ -252,12 +252,12 @@
     },
 
     /**
-     * Method: position
+     * Method: anchorPopup
      *     Anchors a popup to its feature
      *     by registering listeners that reposition the popup
      *     when the map is moved.
      */
-    anchor: function() {
+    anchorPopup: function() {
         this.map.events.on({
             "move" : this.position,
             scope : this            
@@ -272,12 +272,12 @@
     },
 
     /**
-     * APIMethod: unanchor
+     * APIMethod: unanchorPopup
      *     Unanchors a popup from its feature.
      *     Currently, this removes the popup from its MapPanel
      *     and adds it to the page body.
      */
-    unanchor: function() {
+    unanchorPopup: function() {
         this.unbindFromMapPanel();
 
         //make the window draggable
@@ -299,7 +299,7 @@
         //TODO: Make 'unpinned' container configurable
         this.mapPanel.remove(this, false);
 
-        this.container = Ext.getBody()
+        this.container = Ext.getBody();
         
         var xy = this.getPosition();
         this.hide();

Modified: sandbox/opengeo/geoexplorer/modifications.txt
===================================================================
--- sandbox/opengeo/geoexplorer/modifications.txt	2009-04-17 21:58:57 UTC (rev 417)
+++ sandbox/opengeo/geoexplorer/modifications.txt	2009-04-17 22:08:51 UTC (rev 418)
@@ -11,4 +11,5 @@
  * added WMSCapabilitiesReader tests (see #26)
  * Fixed bug with double-click handling on layertree
  * Add reordering support to LegendPanel (geoext #2)
+ * Rename anchor to anchorPopup (see #44)
 

Modified: sandbox/opengeo/geoexplorer/tests/lib/GeoExt/widgets/Popup.html
===================================================================
--- sandbox/opengeo/geoexplorer/tests/lib/GeoExt/widgets/Popup.html	2009-04-17 21:58:57 UTC (rev 417)
+++ sandbox/opengeo/geoexplorer/tests/lib/GeoExt/widgets/Popup.html	2009-04-17 22:08:51 UTC (rev 418)
@@ -83,7 +83,7 @@
             t.ok(context.mapPanel.el.child("div." + pop.popupCls),"Map panel contains popup");
         }
 
-        function test_anchor(t) {
+        function test_anchorPopup(t) {
             t.plan(4);
 
             var context = setupContext();
@@ -112,7 +112,7 @@
         }
 
 
-        function test_unanchor(t) {
+        function test_unanchorPopup(t) {
             t.plan(6);
 
             var context = setupContext();
@@ -125,7 +125,7 @@
 
             var origPos = pop.getPosition();
 
-            pop.unanchor();
+            pop.unanchorPopup();
 
             var newPos = pop.getPosition();