Mathijs den Burger pushed to branch feature/CMS-10559 at cms-community /
hippo-cms
Commits:
f26013f5 by Mathijs den Burger at 2016-12-16T14:23:25+01:00
CMS-10559 Keep (deprecated) TabsPlugin#show for BC
- - - - -
64a657ab by Mathijs den Burger at 2016-12-16T14:34:37+01:00
CMS-10559 Manage 'avoidTabRefocus' with separate setter
Boolean method parameters result in calling code that's hard to
read.
- - - - -
2 changed files:
- api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin.java
-
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.java
Changes:
=====================================
api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin.java
=====================================
---
a/api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/standards/tabs/TabsPlugin.java
@@ -96,7 +96,7 @@ public class TabsPlugin extends RenderPlugin {
private boolean openleft = false;
private boolean isHidden = false;
- private boolean avoidRefocusOnDestroyTab = false;
+ private boolean avoidTabRefocus = false;
public TabsPlugin(IPluginContext context, IPluginConfig properties) {
super(context, properties);
@@ -397,10 +397,10 @@ public class TabsPlugin extends RenderPlugin {
public void hide() {
isHidden = true;
- blurTabs(false);
+ blurTabs();
}
- public void blurTabs(final boolean avoidRefocusOnDestroyTab) {
+ public void blurTabs() {
final int tabIndex = tabbedPanel.getSelectedTab();
if (tabIndex > -1) {
tabbedPanel.setSelectedTab(-1);
@@ -408,7 +408,18 @@ public class TabsPlugin extends RenderPlugin {
onTabDeactivated(tabs.get(tabIndex));
}
- this.avoidRefocusOnDestroyTab = avoidRefocusOnDestroyTab;
+ }
+
+ public void disableTabRefocus() {
+ this.avoidTabRefocus = true;
+ }
+
+ /**
+ * @deprecated use {@link #focusRecentTab} or {@link
#focusRecentTabUnlessHidden()} instead.
+ */
+ @Deprecated
+ public void show() {
+ focusRecentTab();
}
public void focusRecentTabUnlessHidden() {
@@ -450,7 +461,7 @@ public class TabsPlugin extends RenderPlugin {
// hook method for sub-classes to execute logic when a tab is activated
tab.selectionStamp = ++selectionCount;
isHidden = false;
- avoidRefocusOnDestroyTab = false;
+ avoidTabRefocus = false;
}
protected void onTabDeactivated(final Tab tab) {
@@ -503,7 +514,7 @@ public class TabsPlugin extends RenderPlugin {
context.unregisterTracker(decoratorTracker, serviceId);
getTabbedPanel().setSelectedTab(-1);
- if (!avoidRefocusOnDestroyTab) {
+ if (!avoidTabRefocus) {
focusRecentTabUnlessHidden();
}
}
=====================================
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.java
=====================================
---
a/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.java
+++
b/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/browse/BrowserPerspective.java
@@ -186,7 +186,8 @@ public class BrowserPerspective extends Perspective {
@Override
protected void onDeactivated() {
super.onDeactivated();
- tabs.blurTabs(true);
+ tabs.blurTabs();
+ tabs.disableTabRefocus();
}
private boolean hasOpenTabs() {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/3593c98c28c1b35577c7b9feecd679f0b7e3b5b9...64a657ab163a796ab12d1211b13906bdc81d547b
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
