[fusion-commits] r2192 - in trunk/widgets: BufferPanel Search SelectWithin

[svn_fusion at osgeo.org]

Author: hubu
Date: 2010-07-14 02:31:53 +0000 (Wed, 14 Jul 2010)
New Revision: 2192

Modified:
   trunk/widgets/BufferPanel/Buffer.php
   trunk/widgets/BufferPanel/BufferReport.templ
   trunk/widgets/BufferPanel/ErrorPage.templ
   trunk/widgets/Search/ErrorPage.templ
   trunk/widgets/Search/Search.templ
   trunk/widgets/Search/SearchPrompt.templ
   trunk/widgets/SelectWithin/SelectWithinPanel.templ
Log:
Fix the ticket 399. Reviewed by Mike Adair.
And also change the Buffer.php, since the split() function has been deprecated by PHP5.3.1.
So I change the split() to explode().

Modified: trunk/widgets/BufferPanel/Buffer.php
===================================================================
--- trunk/widgets/BufferPanel/Buffer.php	2010-07-08 18:01:52 UTC (rev 2191)
+++ trunk/widgets/BufferPanel/Buffer.php	2010-07-14 02:31:53 UTC (rev 2192)
@@ -87,7 +87,7 @@
         $layers = $map->GetLayers();
         $layer = FindLayer($layers, $bufferName);
 
-        $layerNames = split(",", $layersParam);
+        $layerNames = explode(",", $layersParam);
 
         // convert distance to meters
         if($units == "mi")              //miles

Modified: trunk/widgets/BufferPanel/BufferReport.templ
===================================================================
--- trunk/widgets/BufferPanel/BufferReport.templ	2010-07-08 18:01:52 UTC (rev 2191)
+++ trunk/widgets/BufferPanel/BufferReport.templ	2010-07-14 02:31:53 UTC (rev 2192)
@@ -47,11 +47,16 @@
 }
 
 function GetParent()
-{
-    if(popup)
-        return opener;
-    else
-        return parent.parent;
+{debugger;
+	if(popup)
+		return opener;
+	else
+	{
+		var node = parent;
+		while (!node.Fusion && node.parent)
+			node = node.parent;
+		return node;
+	}
 }
 
 </script>

Modified: trunk/widgets/BufferPanel/ErrorPage.templ
===================================================================
--- trunk/widgets/BufferPanel/ErrorPage.templ	2010-07-08 18:01:52 UTC (rev 2191)
+++ trunk/widgets/BufferPanel/ErrorPage.templ	2010-07-14 02:31:53 UTC (rev 2192)
@@ -49,10 +49,15 @@
 
 function GetParent()
 {
-    if(popup)
-        return opener;
-    else
-        return parent.parent;
+	if(popup)
+		return opener;
+	else
+	{
+		var node = parent;
+		while (!node.fusion && node.parent)
+			node = node.parent;
+		return node;
+	}
 }
 
 </script>

Modified: trunk/widgets/Search/ErrorPage.templ
===================================================================
--- trunk/widgets/Search/ErrorPage.templ	2010-07-08 18:01:52 UTC (rev 2191)
+++ trunk/widgets/Search/ErrorPage.templ	2010-07-14 02:31:53 UTC (rev 2192)
@@ -51,10 +51,15 @@
 
 function GetParent()
 {
-    if(popup)
-        return opener;
-    else
-        return parent.parent;
+	if(popup)
+		return opener;
+	else
+	{
+		var node = parent;
+		while (!node.fusion && node.parent)
+			node = node.parent;
+		return node;
+	}
 }
 
 </script>

Modified: trunk/widgets/Search/Search.templ
===================================================================
--- trunk/widgets/Search/Search.templ	2010-07-08 18:01:52 UTC (rev 2191)
+++ trunk/widgets/Search/Search.templ	2010-07-14 02:31:53 UTC (rev 2192)
@@ -106,10 +106,15 @@
 
 function GetParent()
 {
-    if(popup)
-        return opener;
-    else
-        return parent.parent;
+	if(popup)
+		return opener;
+	else
+	{
+		var node = parent;
+		while (!node.Fusion && node.parent)
+			node = node.parent;
+		return node;
+	}
 }
 
 </script>

Modified: trunk/widgets/Search/SearchPrompt.templ
===================================================================
--- trunk/widgets/Search/SearchPrompt.templ	2010-07-08 18:01:52 UTC (rev 2191)
+++ trunk/widgets/Search/SearchPrompt.templ	2010-07-14 02:31:53 UTC (rev 2192)
@@ -80,10 +80,15 @@
 
 function GetParent()
 {
-    if(popup)
-        return opener;
-    else
-        return parent.parent;
+	if(popup)
+		return opener;
+	else
+	{
+		var node = parent;
+		while (!node.fusion && node.parent)
+			node = node.parent;
+		return node;
+	}
 }
 
 function SetMatchLabel()

Modified: trunk/widgets/SelectWithin/SelectWithinPanel.templ
===================================================================
--- trunk/widgets/SelectWithin/SelectWithinPanel.templ	2010-07-08 18:01:52 UTC (rev 2191)
+++ trunk/widgets/SelectWithin/SelectWithinPanel.templ	2010-07-14 02:31:53 UTC (rev 2192)
@@ -146,12 +146,16 @@
 }
 
 function GetParent()
-{
-    if(popup) {
-        return opener;
-    } else {
-        return parent.parent;
-    }
+{debugger;
+	if(popup)
+		return opener;
+	else
+	{
+		var node = parent;
+		while (!node.Fusion && node.parent)
+			node = node.parent;
+		return node;
+	}
 }
 
 </script>