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/03/24 09:42:56 UTC
svn commit: r1788392 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/
tobago-theme/tobago-theme-standard/src/main/resources/...
Author: lofwyr
Date: Fri Mar 24 09:42:55 2017
New Revision: 1788392
URL: http://svn.apache.org/viewvc?rev=1788392&view=rev
Log:
TOBAGO-1726: Tree icons from <tc:treeIndent> are not toggled correctly.
* updating data attribute names
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-tree.js
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java?rev=1788392&r1=1788391&r2=1788392&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java Fri Mar 24 09:42:55 2017
@@ -98,8 +98,8 @@ public class TreeIconRenderer extends Re
writer.writeStyleAttribute(image.getStyle());
writer.writeClassAttribute(FontAwesomeIconEncoder.FA, FontAwesomeIconEncoder.generateClass(source));
if (folder) {
- writer.writeAttribute(DataAttributes.SRC_OPEN, open, true);
- writer.writeAttribute(DataAttributes.SRC_CLOSED, closed, true);
+ writer.writeAttribute(DataAttributes.OPEN, open, true);
+ writer.writeAttribute(DataAttributes.CLOSED, closed, true);
}
writer.endElement(HtmlElements.I);
} else {
@@ -107,8 +107,8 @@ public class TreeIconRenderer extends Re
HtmlRendererUtils.writeDataAttributes(facesContext, writer, image);
writer.writeAttribute(HtmlAttributes.SRC, source, true);
if (folder) {
- writer.writeAttribute(DataAttributes.SRC_OPEN, open, true);
- writer.writeAttribute(DataAttributes.SRC_CLOSED, closed, true);
+ writer.writeAttribute(DataAttributes.OPEN, open, true);
+ writer.writeAttribute(DataAttributes.CLOSED, closed, true);
}
writer.writeAttribute(HtmlAttributes.ALT, "", false);
writer.endElement(HtmlElements.IMG);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java?rev=1788392&r1=1788391&r2=1788392&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java Fri Mar 24 09:42:55 2017
@@ -81,9 +81,9 @@ public class TreeIndentRenderer extends
writer.writeClassAttribute(FontAwesomeIconEncoder.FA, FontAwesomeIconEncoder.generateClass(icon));
if (folder) {
writer.writeAttribute(
- DataAttributes.SRC_OPEN, FontAwesomeIconEncoder.generateClass(Icons.MINUS_SQUARE_O).getName(), false);
+ DataAttributes.OPEN, FontAwesomeIconEncoder.generateClass(Icons.MINUS_SQUARE_O).getName(), false);
writer.writeAttribute(
- DataAttributes.SRC_CLOSED, FontAwesomeIconEncoder.generateClass(Icons.PLUS_SQUARE_O).getName(), false);
+ DataAttributes.CLOSED, FontAwesomeIconEncoder.generateClass(Icons.PLUS_SQUARE_O).getName(), false);
}
writer.endElement(HtmlElements.I);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java?rev=1788392&r1=1788391&r2=1788392&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java Fri Mar 24 09:42:55 2017
@@ -204,7 +204,7 @@ public class TreeNodeRenderer extends Re
writer.startElement(HtmlElements.IMG);
writer.writeClassAttribute(Classes.create(node, "toggle"));
writer.writeAttribute(HtmlAttributes.SRC, src, false);
- writer.writeAttribute(DataAttributes.SRC_OPEN, srcOpen, false);
+ writer.writeAttribute(DataAttributes.OPEN, srcOpen, false);
writer.writeAttribute(DataAttributes.SRC_CLOSED, srcClose, false);
writer.writeAttribute(HtmlAttributes.ALT, "", false);
writer.endElement(HtmlElements.IMG);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java?rev=1788392&r1=1788391&r2=1788392&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/DataAttributes.java Fri Mar 24 09:42:55 2017
@@ -33,6 +33,11 @@ public enum DataAttributes implements Ma
BEHAVIOR_COMMANDS("data-tobago-behavior-commands"),
/**
+ * Contains the closed tree icon or style.
+ */
+ CLOSED("data-tobago-closed"),
+
+ /**
* The index of the column of a sheet. This index means the position of the rendered column. It can differ, if there
* are tc:column with rendered=false.
*/
@@ -84,11 +89,6 @@ public enum DataAttributes implements Ma
*/
FIRST("data-tobago-first"),
- /*
- * Holds the index of the row in a sheet, if the sheed has a rowRendered attribute.
- */
- ROW_INDEX("data-tobago-row-index"),
-
/**
* Holds the first day of a week of a calendar control.
*/
@@ -114,6 +114,11 @@ public enum DataAttributes implements Ma
*/
MONTH_NAMES("data-tobago-month-names"),
+ /**
+ * Contains the open tree icon or style.
+ */
+ OPEN("data-tobago-open"),
+
PARTIAL_IDS("data-tobago-partial-ids"),
PARTIAL_ACTION("data-tobago-partial-action"),
@@ -130,6 +135,11 @@ public enum DataAttributes implements Ma
ROW_ACTION("data-tobago-row-action"),
+ /*
+ * Holds the index of the row in a sheet, if the sheed has a rowRendered attribute.
+ */
+ ROW_INDEX("data-tobago-row-index"),
+
SELECTION_MODE("data-tobago-selection-mode"),
/**
@@ -143,16 +153,6 @@ public enum DataAttributes implements Ma
SHEET_ID("data-tobago-sheet-id"),
/**
- * Alternate to the src attribute, icon open and close.
- */
- SRC_CLOSED("data-tobago-src-closed"),
-
- /**
- * Alternate to the src attribute, icon open and close.
- */
- SRC_OPEN("data-tobago-src-open"),
-
- /**
* A way to transport style data in JSON format to the browser. With CSP the normal style attribute isn't allowed.
*/
STYLE("data-tobago-style"),
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-tree.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-tree.js?rev=1788392&r1=1788391&r2=1788392&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-tree.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-tree.js Fri Mar 24 09:42:55 2017
@@ -22,23 +22,21 @@ Tobago.Tree.toggleNode = function($eleme
var $node = $element.closest(".tobago-treeNode, .tobago-treeMenuNode");
var $data = $node.closest(".tobago-treeMenu, .tobago-tree, .tobago-sheet");
var $expanded = $data.children(".tobago-treeMenu-expanded, .tobago-tree-expanded, .tobago-sheet-expanded");
- var $toggle = $node.find(".tobago-treeMenuNode-toggle, .tobago-treeNode-toggle");
+ var $toggles = $node.find(".tobago-treeMenuNode-toggle, .tobago-treeNode-toggle");
var rowIndex = Tobago.Tree.rowIndex($node);
if (Tobago.Tree.isExpanded($node, $expanded)) {
Tobago.Tree.hideChildren($node);
- $toggle.find("i").each(function() {
- var $t = jQuery(this);
- var o = $t.data("tobago-src-open");
- var c = $t.data("tobago-src-closed");
- $t.removeClass(o).addClass(c);
+ $toggles.find("i").each(function() {
+ var $toggle = jQuery(this);
+ $toggle.removeClass($toggle.data("tobago-open")).addClass($toggle.data("tobago-closed"));
});
- $toggle.find("img").each(function() {
- var $t = jQuery(this);
- src = $t.data("tobago-src-closed");
+ $toggles.find("img").each(function() {
+ var $toggle = jQuery(this);
+ src = $toggle.data("tobago-closed");
if (src === undefined) { // use the open icon if there is no close icon
- src = $t.data("tobago-src-open");
+ src = $toggle.data("tobago-open");
}
- $t.attr("src", src);
+ $toggle.attr("src", src);
});
$expanded.val($expanded.val().replace(new RegExp("," + rowIndex + ","), ","));
$node.filter(".tobago-treeNode").removeClass("tobago-treeNode-markup-expanded");
@@ -48,7 +46,7 @@ Tobago.Tree.toggleNode = function($eleme
$expanded.val($expanded.val() + rowIndex + ",");
if (reload) {
jsf.ajax.request(
- $toggle.parent().attr("id"),
+ $toggles.parent().attr("id"),
event,
{
//"javax.faces.behavior.event": "click",
@@ -56,19 +54,17 @@ Tobago.Tree.toggleNode = function($eleme
render: $data.attr("id")
});
} else {
- $toggle.find("i").each(function() {
- var $t = jQuery(this);
- var c = $t.data("tobago-src-closed");
- var o = $t.data("tobago-src-open");
- $t.removeClass(c).addClass(o);
+ $toggles.find("i").each(function() {
+ var $toggle = jQuery(this);
+ $toggle.removeClass($toggle.data("tobago-closed")).addClass($toggle.data("tobago-open"));
});
- $toggle.find("img").each(function() {
- var $t = jQuery(this);
- src = $t.data("tobago-src-open");
+ $toggles.find("img").each(function() {
+ var $toggle = jQuery(this);
+ src = $toggle.data("tobago-open");
if (src === undefined) { // use the close icon if there is no open icon
- src = $t.data("tobago-src-closed");
+ src = $toggle.data("tobago-closed");
}
- $t.attr("src", src);
+ $toggle.attr("src", src);
});
$node.filter(".tobago-treeNode").addClass("tobago-treeNode-markup-expanded");
$node.filter(".tobago-treeMenuNode").addClass("tobago-treeMenuNode-markup-expanded");