You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/12/17 14:47:02 UTC
svn commit: r1422929 - in /myfaces/tomahawk/trunk:
core/src/main/java/org/apache/myfaces/custom/tabbedpane/
core/src/main/resources/org/apache/myfaces/custom/tabbedpane/resource/
core20/src/main/java/org/apache/myfaces/custom/tabbedpane/ core20/src/mai...
Author: werpu
Date: Mon Dec 17 13:47:01 2012
New Revision: 1422929
URL: http://svn.apache.org/viewvc?rev=1422929&view=rev
Log:
TOMAHAWK-1651
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/tabbedpane/resource/dynamicTabs.js
myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.tabbedpane/dynamicTabs.js
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java?rev=1422929&r1=1422928&r2=1422929&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java Mon Dec 17 13:47:01 2012
@@ -454,7 +454,7 @@ public class HtmlTabbedPaneRenderer
writer.writeAttribute(HTML.ONCLICK_ATTR,
onclickEvent
- + "return myFaces_showPanelTab("
+ + "return org.apache.myfaces.DynamicTabs.showPanelTab("
+tabIndex+",'"+getTabIndexSubmitFieldIDAndName(tabbedPane, facesContext)+"',"
+'\''+getHeaderCellID(tab, facesContext)+"','"+tab.getClientId(facesContext) + TAB_DIV_SUFFIX +"',"
+getHeaderCellsIDsVar(tabbedPane,facesContext)+','+getTabsIDsVar(tabbedPane,facesContext)+','
Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/tabbedpane/resource/dynamicTabs.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/tabbedpane/resource/dynamicTabs.js?rev=1422929&r1=1422928&r2=1422929&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/tabbedpane/resource/dynamicTabs.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/tabbedpane/resource/dynamicTabs.js Mon Dec 17 13:47:01 2012
@@ -1,55 +1,59 @@
-function myFaces_showPanelTab(
- tabIndex, tabIndexSubmitFieldID,
- headerId, paneId,
- allHeaderCellsIDs, allPanesIDs,
- activeHeaderStyleClass, inactiveHeaderStyleClass,
- activeSubHeaderStyleClass, inactiveSubHeaderStyleClass){
-
- if( ! document.getElementById ) // Too Old Browser. Fallback on server side switch
- return true;
-
- document.getElementById(tabIndexSubmitFieldID).value = tabIndex;
-
- // Change Headers styles
- for(var i = 0; i < allHeaderCellsIDs.length; i++){
- var styleClass;
- if( headerId == allHeaderCellsIDs[i] ){
- styleClass = "myFaces_panelTabbedPane_activeHeaderCell";
- if( activeHeaderStyleClass != null )
- styleClass += " "+activeHeaderStyleClass;
- }else{
- styleClass = "myFaces_panelTabbedPane_inactiveHeaderCell";
- if( inactiveHeaderStyleClass != null )
- styleClass += " "+inactiveHeaderStyleClass
- }
-
- var headerCell = document.getElementById(allHeaderCellsIDs[i]);
- headerCell.className = styleClass;
- }
-
- // Sub Headers
- for(var i = 0; i < allHeaderCellsIDs.length; i++){
- var styleClasses = "myFaces_panelTabbedPane_subHeaderCell";
- if( i == 0 )
- styleClasses += " myFaces_panelTabbedPane_subHeaderCell_first";
- if( headerId == allHeaderCellsIDs[i] ){
- styleClasses += " myFaces_panelTabbedPane_subHeaderCell_active";
- if( activeSubHeaderStyleClass != null )
- styleClasses += " "+activeSubHeaderStyleClass;
- }else{
- styleClasses += " myFaces_panelTabbedPane_subHeaderCell_inactive";
- if( inactiveHeaderStyleClass != null )
- styleClasses += " "+inactiveSubHeaderStyleClass;
- }
-
- var subHeaderCell = document.getElementById(allHeaderCellsIDs[i]+"_sub");
- subHeaderCell.className = styleClasses;
- }
-
- // Switch pane content
- for(var i = 0; i < allPanesIDs.length; i++){
- document.getElementById(allPanesIDs[i]).style.display = (paneId == allPanesIDs[i]) ? 'block':'none';
- }
+window.org = window.org || {};
+org.apache = org.apache || {};
+org.apache.myfaces = org.apache.myfaces || {};
+
+if (!org.apache.myfaces.DynamicTabs) {
+ org.apache.myfaces.DynamicTabs = function() {};
+
+ org.apache.myfaces.DynamicTabs.showPanelTab = function(tabIndex, tabIndexSubmitFieldID, headerId, paneId, allHeaderCellsIDs, allPanesIDs, activeHeaderStyleClass, inactiveHeaderStyleClass, activeSubHeaderStyleClass, inactiveSubHeaderStyleClass) {
+
+ if (!document.getElementById) // Too Old Browser. Fallback on server side switch
+ return true;
+
+ document.getElementById(tabIndexSubmitFieldID).value = tabIndex;
+
+ // Change Headers styles
+ for (var i = 0; i < allHeaderCellsIDs.length; i++) {
+ var styleClass;
+ if (headerId == allHeaderCellsIDs[i]) {
+ styleClass = "myFaces_panelTabbedPane_activeHeaderCell";
+ if (activeHeaderStyleClass != null)
+ styleClass += " " + activeHeaderStyleClass;
+ } else {
+ styleClass = "myFaces_panelTabbedPane_inactiveHeaderCell";
+ if (inactiveHeaderStyleClass != null)
+ styleClass += " " + inactiveHeaderStyleClass
+ }
+
+ var headerCell = document.getElementById(allHeaderCellsIDs[i]);
+ headerCell.className = styleClass;
+ }
+
+ // Sub Headers
+ for (var i = 0; i < allHeaderCellsIDs.length; i++) {
+ var styleClasses = "myFaces_panelTabbedPane_subHeaderCell";
+ if (i == 0)
+ styleClasses += " myFaces_panelTabbedPane_subHeaderCell_first";
+ if (headerId == allHeaderCellsIDs[i]) {
+ styleClasses += " myFaces_panelTabbedPane_subHeaderCell_active";
+ if (activeSubHeaderStyleClass != null)
+ styleClasses += " " + activeSubHeaderStyleClass;
+ } else {
+ styleClasses += " myFaces_panelTabbedPane_subHeaderCell_inactive";
+ if (inactiveHeaderStyleClass != null)
+ styleClasses += " " + inactiveSubHeaderStyleClass;
+ }
+
+ var subHeaderCell = document.getElementById(allHeaderCellsIDs[i] + "_sub");
+ subHeaderCell.className = styleClasses;
+ }
+
+ // Switch pane content
+ for (var i = 0; i < allPanesIDs.length; i++) {
+ document.getElementById(allPanesIDs[i]).style.display = (paneId == allPanesIDs[i]) ? 'block' : 'none';
+ }
+
+ return false;
+ };
- return false;
}
\ No newline at end of file
Modified: myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java?rev=1422929&r1=1422928&r2=1422929&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java (original)
+++ myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java Mon Dec 17 13:47:01 2012
@@ -503,7 +503,7 @@ public class HtmlTabbedPaneRenderer
String activeSubStyleUserClass = tabbedPane.getActiveSubStyleClass();
String inactiveSubStyleUserClass = tabbedPane.getInactiveSubStyleClass();
- String serverSideScript = "return myFaces_showPanelTab("
+ String serverSideScript = "return org.apache.myfaces.DynamicTabs.showPanelTab("
+tabIndex+",'"+getTabIndexSubmitFieldIDAndName(tabbedPane, facesContext)+"',"
+'\''+getHeaderCellID(tab, facesContext)+"','"+tab.getClientId(facesContext) + TAB_DIV_SUFFIX +"',"
+getHeaderCellsIDsVar(tabbedPane,facesContext)+','+getTabsIDsVar(tabbedPane,facesContext)+','
Modified: myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.tabbedpane/dynamicTabs.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.tabbedpane/dynamicTabs.js?rev=1422929&r1=1422928&r2=1422929&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.tabbedpane/dynamicTabs.js (original)
+++ myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.tabbedpane/dynamicTabs.js Mon Dec 17 13:47:01 2012
@@ -1,55 +1,59 @@
-function myFaces_showPanelTab(
- tabIndex, tabIndexSubmitFieldID,
- headerId, paneId,
- allHeaderCellsIDs, allPanesIDs,
- activeHeaderStyleClass, inactiveHeaderStyleClass,
- activeSubHeaderStyleClass, inactiveSubHeaderStyleClass){
-
- if( ! document.getElementById ) // Too Old Browser. Fallback on server side switch
- return true;
-
- document.getElementById(tabIndexSubmitFieldID).value = tabIndex;
-
- // Change Headers styles
- for(var i = 0; i < allHeaderCellsIDs.length; i++){
- var styleClass;
- if( headerId == allHeaderCellsIDs[i] ){
- styleClass = "myFaces_panelTabbedPane_activeHeaderCell";
- if( activeHeaderStyleClass != null )
- styleClass += " "+activeHeaderStyleClass;
- }else{
- styleClass = "myFaces_panelTabbedPane_inactiveHeaderCell";
- if( inactiveHeaderStyleClass != null )
- styleClass += " "+inactiveHeaderStyleClass
- }
-
- var headerCell = document.getElementById(allHeaderCellsIDs[i]);
- headerCell.className = styleClass;
- }
-
- // Sub Headers
- for(var i = 0; i < allHeaderCellsIDs.length; i++){
- var styleClasses = "myFaces_panelTabbedPane_subHeaderCell";
- if( i == 0 )
- styleClasses += " myFaces_panelTabbedPane_subHeaderCell_first";
- if( headerId == allHeaderCellsIDs[i] ){
- styleClasses += " myFaces_panelTabbedPane_subHeaderCell_active";
- if( activeSubHeaderStyleClass != null )
- styleClasses += " "+activeSubHeaderStyleClass;
- }else{
- styleClasses += " myFaces_panelTabbedPane_subHeaderCell_inactive";
- if( inactiveHeaderStyleClass != null )
- styleClasses += " "+inactiveSubHeaderStyleClass;
- }
-
- var subHeaderCell = document.getElementById(allHeaderCellsIDs[i]+"_sub");
- subHeaderCell.className = styleClasses;
- }
-
- // Switch pane content
- for(var i = 0; i < allPanesIDs.length; i++){
- document.getElementById(allPanesIDs[i]).style.display = (paneId == allPanesIDs[i]) ? 'block':'none';
- }
+window.org = window.org || {};
+org.apache = org.apache || {};
+org.apache.myfaces = org.apache.myfaces || {};
+
+if (!org.apache.myfaces.DynamicTabs) {
+ org.apache.myfaces.DynamicTabs = function() {};
+
+ org.apache.myfaces.DynamicTabs.showPanelTab = function(tabIndex, tabIndexSubmitFieldID, headerId, paneId, allHeaderCellsIDs, allPanesIDs, activeHeaderStyleClass, inactiveHeaderStyleClass, activeSubHeaderStyleClass, inactiveSubHeaderStyleClass) {
+
+ if (!document.getElementById) // Too Old Browser. Fallback on server side switch
+ return true;
+
+ document.getElementById(tabIndexSubmitFieldID).value = tabIndex;
+
+ // Change Headers styles
+ for (var i = 0; i < allHeaderCellsIDs.length; i++) {
+ var styleClass;
+ if (headerId == allHeaderCellsIDs[i]) {
+ styleClass = "myFaces_panelTabbedPane_activeHeaderCell";
+ if (activeHeaderStyleClass != null)
+ styleClass += " " + activeHeaderStyleClass;
+ } else {
+ styleClass = "myFaces_panelTabbedPane_inactiveHeaderCell";
+ if (inactiveHeaderStyleClass != null)
+ styleClass += " " + inactiveHeaderStyleClass
+ }
+
+ var headerCell = document.getElementById(allHeaderCellsIDs[i]);
+ headerCell.className = styleClass;
+ }
+
+ // Sub Headers
+ for (var i = 0; i < allHeaderCellsIDs.length; i++) {
+ var styleClasses = "myFaces_panelTabbedPane_subHeaderCell";
+ if (i == 0)
+ styleClasses += " myFaces_panelTabbedPane_subHeaderCell_first";
+ if (headerId == allHeaderCellsIDs[i]) {
+ styleClasses += " myFaces_panelTabbedPane_subHeaderCell_active";
+ if (activeSubHeaderStyleClass != null)
+ styleClasses += " " + activeSubHeaderStyleClass;
+ } else {
+ styleClasses += " myFaces_panelTabbedPane_subHeaderCell_inactive";
+ if (inactiveHeaderStyleClass != null)
+ styleClasses += " " + inactiveSubHeaderStyleClass;
+ }
+
+ var subHeaderCell = document.getElementById(allHeaderCellsIDs[i] + "_sub");
+ subHeaderCell.className = styleClasses;
+ }
+
+ // Switch pane content
+ for (var i = 0; i < allPanesIDs.length; i++) {
+ document.getElementById(allPanesIDs[i]).style.display = (paneId == allPanesIDs[i]) ? 'block' : 'none';
+ }
+
+ return false;
+ };
- return false;
}
\ No newline at end of file