Author: solomax
Date: Thu Jul 24 17:31:46 2014
New Revision: 1613196
URL: http://svn.apache.org/r1613196
Log:
[OPENMEETINGS-1052] url fragment change works as expected
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1613196&r1=1613195&r2=1613196&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java
Thu Jul 24 17:31:46 2014
@@ -146,6 +146,10 @@ public class MainPage extends BaseInited
}
public void updateContents(OmUrlFragment f, AjaxRequestTarget target) {
+ updateContents(f, target, true);
+ }
+
+ public void updateContents(OmUrlFragment f, AjaxRequestTarget target,
boolean updateFragment) {
BasePanel panel = getPanel(f.getArea(), f.getType());
if (panel != null) {
Component prev = contents.get(CHILD_ID);
@@ -153,8 +157,10 @@ public class MainPage extends BaseInited
((BasePanel)prev).cleanup(target);
}
target.add(contents.replace(panel));
- UrlFragment uf = new UrlFragment(target);
- uf.set(f.getArea().name(), f.getType());
+ if (updateFragment) {
+ UrlFragment uf = new UrlFragment(target);
+ uf.set(f.getArea().name(), f.getType());
+ }
panel.onMenuPanelLoad(target);
}
if (dev != null){
@@ -167,7 +173,7 @@ public class MainPage extends BaseInited
OmUrlFragment uf = getUrlFragment(params);
if (uf != null) {
areaBehavior.stop(target);
- updateContents(uf, target);
+ updateContents(uf, target, false);
}
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1613196&r1=1613195&r2=1613196&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
Thu Jul 24 17:31:46 2014
@@ -188,6 +188,10 @@ public class MainPage extends BaseInited
}
public void updateContents(OmUrlFragment f, AjaxRequestTarget target) {
+ updateContents(f, target, true);
+ }
+
+ public void updateContents(OmUrlFragment f, AjaxRequestTarget target,
boolean updateFragment) {
BasePanel panel = getPanel(f.getArea(), f.getType());
if (panel != null) {
Component prev = contents.get(CHILD_ID);
@@ -195,8 +199,10 @@ public class MainPage extends BaseInited
((BasePanel)prev).cleanup(target);
}
target.add(contents.replace(panel));
- UrlFragment uf = new UrlFragment(target);
- uf.set(f.getArea().name(), f.getType());
+ if (updateFragment) {
+ UrlFragment uf = new UrlFragment(target);
+ uf.set(f.getArea().name(), f.getType());
+ }
panel.onMenuPanelLoad(target);
}
if (dev != null){
@@ -209,7 +215,7 @@ public class MainPage extends BaseInited
OmUrlFragment uf = getUrlFragment(params);
if (uf != null) {
areaBehavior.stop(target);
- updateContents(uf, target);
+ updateContents(uf, target, false);
}
}
