geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r939670 - in /geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes: navigation.jsp portlets-with-tree.jsp
Date Fri, 30 Apr 2010 13:43:34 GMT
Author: genspring
Date: Fri Apr 30 13:43:33 2010
New Revision: 939670

URL: http://svn.apache.org/viewvc?rev=939670&view=rev
Log:
GERONIMO-5217 History.back and History.forward is not working correctly after change the console
navigation to ajax.

Modified:
    geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
    geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp

Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp?rev=939670&r1=939669&r2=939670&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
(original)
+++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
Fri Apr 30 13:43:33 2010
@@ -63,7 +63,6 @@ limitations under the License.
 <%=generator.generateLinks(pageConfigList, request.getContextPath(), "/images/ico_doc_16x16.gif")%>
 </div>
 
-<script type="text/javascript" src="/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
 
 <script type="text/javascript">
 
@@ -176,6 +175,7 @@ function load() {
     
         document.getElementById("portletsFrame").src = iframeHref+"?formId="+formID;
         setTimeout('returnToTop()', 30);
+
      }
      
     function returnToTop(){

Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp?rev=939670&r1=939669&r2=939670&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp
(original)
+++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp
Fri Apr 30 13:43:33 2010
@@ -25,6 +25,39 @@ limitations under the License.
 
 <body id="admin-console" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0"
rightmargin="0">
 
+
+<script type="text/javascript" src="/dojo/dojo/dojo.js" djConfig="parseOnLoad: true">
+
+</script>
+
+
+<script>
+<%-- we have to use dojo.hash to maintain the hash change history because browser does
not 
+recogonize a hash change when users click back/forward button.--%>
+
+dojo.require("dojo.hash");
+dojo.require("dojox.collections.Dictionary");
+
+var hash_iframeSrc_map= new dojox.collections.Dictionary;
+
+
+function onHashChange(current_hash) {
+
+    if(current_hash&&!hash_iframeSrc_map.containsKey(current_hash)){
+
+        hash_iframeSrc_map.add(current_hash,document.getElementById("portletsFrame").src);
+
+    } else {
+        document.getElementById("portletsFrame").src=""+hash_iframeSrc_map.entry(current_hash).value;
+    }
+}
+
+dojo.subscribe("/dojo/hashchange", this, this.onHashChange);
+
+
+</script>
+
+
 <script language="JavaScript">
 
 <%-- When there's hash in current page url



Mime
View raw message