svn commit: r232866 - in /beehive/trunk/netui: src/javascript/tagshtml/ src/pageflow/org/apache/beehive/netui/pageflow/ test/webapps/drt/coreWeb/tags/attribute/ test/webapps/drt/testRecorder/tests/

[ri...@apache.org]

Author: rich
Date: Mon Aug 15 13:02:43 2005
New Revision: 232866

URL: http://svn.apache.org/viewcvs?rev=232866&view=rev
Log:
This is another contribution from Carlin Rogers to address http://issues.apache.org/jira/browse/BEEHIVE-879 : collapse/expand tree button does not work for two tree portlets on one page - fix netui-tree.js

tests: bvt in netui (WinXP)
BB: self (linux)


Modified:
    beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
    beehive/trunk/netui/test/webapps/drt/coreWeb/tags/attribute/baseErrors.jsp
    beehive/trunk/netui/test/webapps/drt/testRecorder/tests/AttributeTagErrors.xml

Modified: beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js?rev=232866&r1=232865&r2=232866&view=diff
==============================================================================
--- beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js (original)
+++ beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js Mon Aug 15 13:02:43 2005
@@ -29,7 +29,9 @@
 }
 
 // create the variable, it will be empty
-var netUI = new NetUI();
+if (!netUI) {
+    var netUI = new NetUI();
+}
 
 NetUI.prototype.action = function(command)
 {

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java?rev=232866&r1=232865&r2=232866&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java Mon Aug 15 13:02:43 2005
@@ -49,7 +49,6 @@
 import org.apache.beehive.netui.pageflow.internal.InternalConstants;
 import org.apache.beehive.netui.pageflow.internal.AdapterManager;
 import org.apache.beehive.netui.pageflow.internal.PageFlowRequestWrapper;
-import org.apache.beehive.netui.pageflow.internal.DeferredSessionStorageHandler;
 import org.apache.beehive.netui.pageflow.handler.Handlers;
 import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
 

Modified: beehive/trunk/netui/test/webapps/drt/coreWeb/tags/attribute/baseErrors.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/attribute/baseErrors.jsp?rev=232866&r1=232865&r2=232866&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/tags/attribute/baseErrors.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/tags/attribute/baseErrors.jsp Mon Aug 15 13:02:43 2005
@@ -19,8 +19,6 @@
 
             <%-- Test disallowed attributes --%>
             <%-- these cause errors --%>          
-            <netui:attribute name="id" value="whatever"/>
-            <netui:attribute name="name" value="whatever"/>
             <netui:attribute name="href" value="whatever"/>
         </netui:base>
         <title>

Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/AttributeTagErrors.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/AttributeTagErrors.xml?rev=232866&r1=232865&r2=232866&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/AttributeTagErrors.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/AttributeTagErrors.xml Mon Aug 15 13:02:43 2005
@@ -141,7 +141,7 @@
         
         
 
-        <base href="http://localhost:8080/coreWeb/tags/attribute/baseErrors.jsp" target="_myAttributeTop" customAttr="red" name="whatever" anotherCustomAttr="anotherCustomValue" id="whatever"><span style="color:red;background-color:white">
+        <base href="http://localhost:8080/coreWeb/tags/attribute/baseErrors.jsp" target="_myAttributeTop" customAttr="red" anotherCustomAttr="anotherCustomValue"><span style="color:red;background-color:white">
  [<b>Tag Error:1</b>, Found in tag <b>Base</b>]</span>
         <title>
             Test Attribute Tag