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 2017/04/05 14:01:15 UTC
svn commit: r1790267 - in /myfaces/tobago/branches/TOBAGO-1719: ./
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/
tobago-core/src/main/java/org/apache/myface...
Author: lofwyr
Date: Wed Apr 5 14:01:15 2017
New Revision: 1790267
URL: http://svn.apache.org/viewvc?rev=1790267&view=rev
Log:
Merged from trunk
TOBAGO-1728: Selector for all/none/toggle in sheet is displayed behind the sheet-body
* Re-implementation with a single checkbox instead of using dropdown menu.
* It's easier to implement and easier to use. [from revision 1790232]
TOBAGO-1728: Selector for all/none/toggle in sheet is displayed behind the sheet-body
* fix selector [from revision 1790263]
Modified:
myfaces/tobago/branches/TOBAGO-1719/ (props changed)
myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java (contents, props changed)
myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource.xml
myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_de.xml
myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_es.xml
myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss (contents, props changed)
myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/sheet-column-selector.xhtml
myfaces/tobago/branches/TOBAGO-1719/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-sheet.js (contents, props changed)
Propchange: myfaces/tobago/branches/TOBAGO-1719/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 5 14:01:15 2017
@@ -1,4 +1,4 @@
/myfaces/tobago/branches/tobago-1.5.x:1356585,1357124
/myfaces/tobago/branches/tobago-3.0.x:1781306,1781310,1781380
/myfaces/tobago/branches/tobago-tree-table:1226794-1341423
-/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664
,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219,1787403,1787422,1787443,1787651,1787780,1787926,1788112,1788115,1788125,1788196,1788214-1788215,1788225,1788239,1788381,1788385,1788392,1788484,1788502,1789295,1789305,1789309,1789347-1789348,1789354,1789364,1789366,1789379-1789380,1789406,1789409,1789500,1789568,1789645,1790126,1790134
+/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664
,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219,1787403,1787422,1787443,1787651,1787780,1787926,1788112,1788115,1788125,1788196,1788214-1788215,1788225,1788239,1788381,1788385,1788392,1788484,1788502,1789295,1789305,1789309,1789347-1789348,1789354,1789364,1789366,1789379-1789380,1789406,1789409,1789500,1789568,1789645,1790126,1790134,1790232,1790263
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java?rev=1790267&r1=1790266&r2=1790267&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/context/Markup.java Wed Apr 5 14:01:15 2017
@@ -96,8 +96,14 @@ public final class Markup implements Ser
public static final Markup RIGHT = valueOf("right");
public static final Markup SECONDS = valueOf("seconds");
public static final Markup SELECTED = valueOf("selected");
+ /** @deprecated since 3.0.4 */
+ @Deprecated
public static final Markup SHEET_SELECT_ALL = valueOf("sheetSelectAll");
+ /** @deprecated since 3.0.4 */
+ @Deprecated
public static final Markup SHEET_DESELECT_ALL = valueOf("sheetDeselectAll");
+ /** @deprecated since 3.0.4 */
+ @Deprecated
public static final Markup SHEET_TOGGLE_ALL = valueOf("sheetToggleAll");
public static final Markup SMALL = valueOf("small");
public static final Markup SORTABLE = valueOf("sortable");
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java?rev=1790267&r1=1790266&r2=1790267&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java Wed Apr 5 14:01:15 2017
@@ -63,10 +63,8 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Icons;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
-import org.apache.myfaces.tobago.renderkit.html.Arias;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlButtonTypes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -98,7 +96,6 @@ public class SheetRenderer extends Rende
private static final String SUFFIX_COLUMN_RENDERED = ComponentUtils.SUB_SEPARATOR + "rendered";
private static final String SUFFIX_SCROLL_POSITION = ComponentUtils.SUB_SEPARATOR + "scrollPosition";
private static final String SUFFIX_SELECTED = ComponentUtils.SUB_SEPARATOR + "selected";
- private static final String SUFFIX_SELECTOR_DROPDOWN = ComponentUtils.SUB_SEPARATOR + "selectorDropdown";
@Override
public void decode(final FacesContext facesContext, final UIComponent component) {
@@ -634,7 +631,7 @@ public class SheetRenderer extends Rende
writer.writeAttribute(HtmlAttributes.DISABLED, selector.isDisabled());
writer.writeClassAttribute(
BootstrapClass.FORM_CHECK_INLINE,
- Classes.create(sheet, "columnSelector"));
+ TobagoClass.SHEET__COLUMN_SELECTOR);
writer.endElement(HtmlElements.INPUT);
} else if (normalColumn instanceof AbstractUIColumnNode) {
RenderUtils.encode(facesContext, normalColumn);
@@ -860,44 +857,15 @@ public class SheetRenderer extends Rende
writer.writeAttribute(HtmlAttributes.TITLE, tip, true);
if (column instanceof UIColumnSelector && selectable.isMulti()) {
- writer.writeClassAttribute(Classes.create(sheet, "selectorDropdown"));
+ writer.startElement(HtmlElements.INPUT);
+ writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX);
- writer.startElement(HtmlElements.DIV);
- writer.writeClassAttribute(BootstrapClass.DROPDOWN);
- writer.startElement(HtmlElements.BUTTON);
- writer.writeClassAttribute(
- BootstrapClass.BTN, BootstrapClass.BTN_SECONDARY, BootstrapClass.DROPDOWN_TOGGLE);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
- writer.writeIdAttribute(sheet.getClientId(facesContext) + SUFFIX_SELECTOR_DROPDOWN);
- writer.writeAttribute(DataAttributes.TOGGLE, "dropdown", false);
- writer.writeAttribute(Arias.HASPOPUP, Boolean.TRUE.toString(), false);
- writer.writeAttribute(Arias.EXPANDED, Boolean.FALSE.toString(), false);
- writer.endElement(HtmlElements.BUTTON);
- writer.startElement(HtmlElements.DIV);
- writer.writeClassAttribute(BootstrapClass.DROPDOWN_MENU);
- writer
- .writeAttribute(Arias.LABELLEDBY, sheet.getClientId(facesContext) + SUFFIX_SELECTOR_DROPDOWN, false);
- writer.startElement(HtmlElements.BUTTON);
- writer.writeClassAttribute(BootstrapClass.DROPDOWN_ITEM);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
- writer.writeAttribute(DataAttributes.COMMAND, "sheetSelectAll", false);
- writer.writeText(TobagoResourceBundle.getString(facesContext, "sheetMenuSelect"));
- writer.endElement(HtmlElements.BUTTON);
- writer.startElement(HtmlElements.BUTTON);
- writer.writeClassAttribute(BootstrapClass.DROPDOWN_ITEM);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
- writer.writeAttribute(DataAttributes.COMMAND, "sheetDeselectAll", false);
- writer.writeText(TobagoResourceBundle.getString(facesContext, "sheetMenuUnselect"));
- writer.endElement(HtmlElements.BUTTON);
- writer.startElement(HtmlElements.BUTTON);
- writer.writeClassAttribute(BootstrapClass.DROPDOWN_ITEM);
- writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
- writer.writeAttribute(DataAttributes.COMMAND, "sheetToggleAll", false);
- writer
- .writeText(TobagoResourceBundle.getString(facesContext, "sheetMenuToggleselect"));
- writer.endElement(HtmlElements.BUTTON);
- writer.endElement(HtmlElements.DIV);
- writer.endElement(HtmlElements.DIV);
+ writer.writeClassAttribute(TobagoClass.SHEET__COLUMN_SELECTOR);
+ writer.writeAttribute(
+ HtmlAttributes.TITLE,
+ TobagoResourceBundle.getString(facesContext, "sheetMenuSelect"),
+ true);
+ writer.endElement(HtmlElements.INPUT);
} else {
RenderUtils.encode(facesContext, cellComponent);
}
Propchange: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 5 14:01:15 2017
@@ -1,4 +1,4 @@
/myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java:1356585,1357124
/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java:1226794-1341423
-/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java:1789354,1789364,1789366,1789379-1789380
+/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java:1789354,1789364,1789366,1789379-1789380,1790232
/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1642608,1657269,1682545
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java?rev=1790267&r1=1790266&r2=1790267&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java Wed Apr 5 14:01:15 2017
@@ -83,6 +83,7 @@ public enum TobagoClass implements CssIt
SELECT_ONE_RADIO__INLINE("tobago-selectOneRadio-inline"),
SHEET__HEADER("tobago-sheet-header"),
SHEET__BODY_TABLE("tobago-sheet-bodyTable"),
+ SHEET__COLUMN_SELECTOR("tobago-sheet-columnSelector"),
SHEET__HEADER_TABLE("tobago-sheet-headerTable"),
SHEET__PAGING_INPUT("tobago-sheet-pagingInput"),
SHEET__PAGING_OUTPUT("tobago-sheet-pagingOutput"),
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource.xml?rev=1790267&r1=1790266&r2=1790267&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource.xml (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource.xml Wed Apr 5 14:01:15 2017
@@ -58,8 +58,6 @@
<entry key="sheetPagingInfoUndefinedSinglePage">Page {0}</entry>
<entry key="sheetPagingInfoEmptyPage"/>
<entry key="sheetPagingInfoPagePagingTip">Click here, to change the displayed page</entry>
- <entry key="sheetMenuToggleselect">Invert selections</entry>
- <entry key="sheetMenuUnselect">Unselect all</entry>
<entry key="sheetMenuSelect">Select all</entry>
<!-- Tree -->
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_de.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_de.xml?rev=1790267&r1=1790266&r2=1790267&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_de.xml (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_de.xml Wed Apr 5 14:01:15 2017
@@ -61,9 +61,7 @@
<entry key="sheetPagingInfoUndefinedSinglePage">Seite {0}</entry>
<entry key="sheetPagingInfoEmptyPage"/>
<entry key="sheetPagingInfoPagePagingTip">Hier klicken, zum Eingeben der anzuzeigenden Seite.</entry>
- <entry key="sheetMenuToggleselect">Markierung umkehren</entry>
- <entry key="sheetMenuUnselect">Markierungen löschen</entry>
- <entry key="sheetMenuSelect">Alles markieren</entry>
+ <entry key="sheetMenuSelect">Alles auswählen</entry>
<!-- Tree -->
<entry key="treeNew">Neu</entry>
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_es.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_es.xml?rev=1790267&r1=1790266&r2=1790267&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_es.xml (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/org/apache/myfaces/tobago/context/TobagoResource_es.xml Wed Apr 5 14:01:15 2017
@@ -58,8 +58,6 @@
<entry key="sheetPagingInfoUndefinedSinglePage">Página {0}</entry>
<entry key="sheetPagingInfoEmptyPage"/>
<entry key="sheetPagingInfoPagePagingTip">Click aquí, para cambiar el nombre desplegado.</entry>
- <entry key="sheetMenuToggleselect">Invertir seleccion</entry>
- <entry key="sheetMenuUnselect">Deseleccionar todo</entry>
<entry key="sheetMenuSelect">Seleccionar todo</entry>
<!-- Tree -->
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss?rev=1790267&r1=1790266&r2=1790267&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss Wed Apr 5 14:01:15 2017
@@ -22,6 +22,9 @@ XXX code will be inserted after the _var
$brand-info: #00f !default;
$zindex-dropdown: 1000 !default;
$zindex-popover: 1060 !default;
+$spacer: 1rem !default;
+$spacer-x: $spacer !default;
+$spacer-y: $spacer !default;
/* fix bootstrap ---------------------------------------------------- */
span.dropdown {
@@ -37,7 +40,7 @@ Todo: check, if this is needed? (It does
*/
/*
-.tobago-treeNode-toggle // XXX dummy: only occurs in JavaScript, is here to satisfy the Test
+.tobago-treeNode-toggle // XXX dummy: only occurs in JavaScript, is here to satisfy the TobagoClassUnitTest
*/
/*
@@ -759,6 +762,11 @@ th.tobago-sheet-headerCell .tobago-out {
flex-shrink: 0;
}
+.tobago-sheet-columnSelector {
+ margin-top: ($spacer-y * 0.75);
+ margin-bottom: ($spacer-y * 0.75);
+}
+
.tobago-sheet {
display: flex;
flex-direction: column;
Propchange: myfaces/tobago/branches/TOBAGO-1719/tobago-core/src/main/resources/scss/_tobago.scss
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 5 14:01:15 2017
@@ -1,4 +1,4 @@
/myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css:1356585,1357124
/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css:1226794-1341423
-/myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss:1787403,1787422,1788112,1788125,1788239,1789500
+/myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss:1787403,1787422,1788112,1788125,1788239,1789500,1790232
/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1656502,1656507,1657180,1657269,1657276,1657279,1658343,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665486,1665521,1665549,1665569-1665570,1666464,1667304,1667306-1667307,1667309,1668147,1668153,1668249,1675330,1675565,1675584,16755
88-1675589,1675636,1676030,1676035,1676038,1679031,1680197,1681981,1682187,1682448,1682545,1682548,1683231,1683306,1683373,1683664,1686204,1687354,1693426,1696720,1698292,1698297,1700742,1700795,1701249,1701251,1701256,1701980,1709006,1725894,1726691,1726986,1727161,1731050-1731051,1731054,1731057,1731218-1731219
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/sheet-column-selector.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/sheet-column-selector.xhtml?rev=1790267&r1=1790266&r2=1790267&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/sheet-column-selector.xhtml (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/sheet-column-selector.xhtml Wed Apr 5 14:01:15 2017
@@ -64,7 +64,7 @@
</tc:column>
</tc:sheet>
- <tc:selectOneRadio label="Mode" value="#{sheetController.selectable}">
+ <tc:selectOneRadio label="Mode" value="#{sheetController.selectable}" required="true">
<tc:selectItems value="#{sheetController.selectableModes}"/>
<f:ajax render="s4"/>
</tc:selectOneRadio>
Modified: myfaces/tobago/branches/TOBAGO-1719/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-sheet.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/TOBAGO-1719/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-sheet.js?rev=1790267&r1=1790266&r2=1790267&view=diff
==============================================================================
--- myfaces/tobago/branches/TOBAGO-1719/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-sheet.js (original)
+++ myfaces/tobago/branches/TOBAGO-1719/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-sheet.js Wed Apr 5 14:01:15 2017
@@ -71,14 +71,13 @@ Tobago.Sheet.init = function(elements) {
Tobago.Sheet.setup2(sheets);
- Tobago.Utils.selectWithJQuery(elements, "button[data-tobago-command=sheetSelectAll]").click(function(event) {
- Tobago.Sheet.selectAll(jQuery(event.target).closest(".tobago-sheet"));
- });
- Tobago.Utils.selectWithJQuery(elements, "button[data-tobago-command=sheetDeselectAll]").click(function(event) {
- Tobago.Sheet.deselectAll(jQuery(event.target).closest(".tobago-sheet"));
- });
- Tobago.Utils.selectWithJQuery(elements, "button[data-tobago-command=sheetToggleAll]").click(function(event) {
- Tobago.Sheet.toggleAll(jQuery(event.target).closest(".tobago-sheet"));
+ Tobago.Utils.selectWithJQuery(elements, ".tobago-sheet-header .tobago-sheet-columnSelector").click(function(event) {
+ var $checkbox = jQuery(event.target);
+ if ($checkbox.is(':checked')) {
+ Tobago.Sheet.selectAll($checkbox.closest(".tobago-sheet"));
+ } else {
+ Tobago.Sheet.deselectAll($checkbox.closest(".tobago-sheet"));
+ }
});
console.timeEnd("[tobago-sheet] init"); // @DEV_ONLY
@@ -423,7 +422,7 @@ Tobago.Sheet.setup2 = function (sheets)
}
});
}
- sheet.find("input.tobago-sheet-columnSelector").click(function(event) {event.preventDefault()});
+ sheet.find(".tobago-sheet-cell > input.tobago-sheet-columnSelector").click(function(event) {event.preventDefault()});
});
// init reload
Propchange: myfaces/tobago/branches/TOBAGO-1719/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-sheet.js
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 5 14:01:15 2017
@@ -1,3 +1,4 @@
/myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js:1356585,1357124
/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js:1226794-1341423
+/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-sheet.js:1790232,1790263
/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602101,1621332,1622508,1625972,1636842,1639304,1642657,1646035