You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/11/09 14:10:03 UTC
svn commit: r1768966 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/
tobago-theme/tobago-theme-standard/src/main/resources/org/apa...
Author: lofwyr
Date: Wed Nov 9 14:10:03 2016
New Revision: 1768966
URL: http://svn.apache.org/viewvc?rev=1768966&view=rev
Log:
TOBAGO-1529: Navbar, Toolbar, Menu, etc. for Bootstrap
* cleanup
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java?rev=1768966&r1=1768965&r2=1768966&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Attributes.java Wed Nov 9 14:10:03 2016
@@ -227,7 +227,6 @@ public enum Attributes {
stateChangeListener,
statePreview,
style,
- suppressToolbarContainer,
switchType,
tabIndex,
target,
@@ -726,9 +725,6 @@ public enum Attributes {
public static final String STYLE_CLASS = "styleClass";
/** @deprecated Since Tobago 3.0.0. Please use the enum */
@Deprecated
- public static final String SUPPRESS_TOOLBAR_CONTAINER = "suppressToolbarContainer";
- /** @deprecated Since Tobago 3.0.0. Please use the enum */
- @Deprecated
public static final String SWITCH_TYPE = "switchType";
/** @deprecated Since Tobago 3.0.0. Please use the enum */
@Deprecated
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java?rev=1768966&r1=1768965&r2=1768966&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java Wed Nov 9 14:10:03 2016
@@ -48,8 +48,6 @@ import javax.faces.component.UIPanel;
description = "Contains some code to be placed in the header at the bar position."),
@Facet(name = Facets.LABEL,
description = "Contains some code to be placed in the header at the label position."),
- @Facet(name = Facets.TOOL_BAR, description = "Deprecated! Contains an instance of UIToolBar",
- allowedChildComponenents = "org.apache.myfaces.tobago.ToolBar"),
@Facet(name = Facets.MENU_BAR, description = "Deprecated!"),
@Facet(name=Facets.LAYOUT, description = "Deprecated! Contains an layout manager. "
+ "The layout manager tag should surround the content instead.")})
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java?rev=1768966&r1=1768965&r2=1768966&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabTagDeclaration.java Wed Nov 9 14:10:03 2016
@@ -50,9 +50,7 @@ import javax.faces.component.UIPanel;
rendererType = RendererTypes.TAB,
facets = {
@Facet(name = Facets.BAR,
- description = "Contains some code to be placed in the header at the bar position."),
- @Facet(name = Facets.TOOL_BAR, description = "Deprecated! Contains an instance of UIToolBar",
- allowedChildComponenents = "org.apache.myfaces.tobago.ToolBar")})
+ description = "Contains some code to be placed in the header at the bar position.")})
public interface TabTagDeclaration
extends HasIdBindingAndRendered, IsVisual, HasLabel, HasAccessKey, HasTip, IsDisabled, HasImage {
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js?rev=1768966&r1=1768965&r2=1768966&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-menu.js Wed Nov 9 14:10:03 2016
@@ -267,9 +267,7 @@ Tobago.Menu.switchOn = function(menuBar,
.bind(compatibleKeyEvent(), Tobago.Menu.handelKey);
var a = menu.children('a');
if (! a.data("tobago-ignore-focus")) { // can be removed, after refactoring to a jQuery widget variable
- if (menu.parents(".tobago-toolBar").size() == 0
- && menu.parents(".tobago-box-headerToolBar").size() == 0
- && menu.parents(".tobago-column-menu").size() == 0) {
+ if (menu.parents(".tobago-column-menu").size() == 0) {
a.trigger("focus");
} else {
// XXX the call in the previous line doesn't work with toolBar -> dropDown (don't know why), so using direct call
@@ -361,8 +359,7 @@ Tobago.Menu.init = function(elements) {
// jQuery(".tobago-page-menuStore").append(menus.children("ol"));
- var toolBarMenu = Tobago.Utils.selectWithJQuery(
- elements, ".tobago-toolBar-menu, .tobago-column-menu");
+ var toolBarMenu = Tobago.Utils.selectWithJQuery(elements, ".tobago-column-menu");
// a click on toolBar menu opener -> forward to .tobago-menu-markup-top
toolBarMenu.click(function(event) {
jQuery(this).find('a').click();
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1768966&r1=1768965&r2=1768966&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Wed Nov 9 14:10:03 2016
@@ -1142,20 +1142,6 @@ Tobago.ToolBar.init = function(elements)
event.stopPropagation();
})
});
-
- Tobago.Utils.selectWithJQuery(elements, ".tobago-toolBar-selectOne").find(".tobago-toolBar-button")
- .click(function () {
- var button = jQuery(this);
- var hidden = button.closest(".tobago-toolBar-selectOne").children("input[type=hidden]");
- hidden.val(button.data("tobago-value"));
- });
-
- Tobago.Utils.selectWithJQuery(elements, ".tobago-toolBar-selectBoolean").find(".tobago-toolBar-button")
- .click(function () {
- var button = jQuery(this);
- var hidden = button.closest(".tobago-toolBar-selectBoolean").children("input[type=hidden]");
- hidden.val(hidden.val() == "true" ? "false" : "true");
- });
};
Tobago.registerListener(Tobago.ToolBar.init, Tobago.Phase.DOCUMENT_READY);