diff options
author | Leif Åstrand <legioth@gmail.com> | 2017-11-23 07:54:53 +0200 |
---|---|---|
committer | Aleksi Hietanen <aleksi@vaadin.com> | 2017-11-23 07:54:53 +0200 |
commit | 2fc7554779cb3df2e58dab9057a9b51839e84930 (patch) | |
tree | 6756c03d2f8a86082af175211985a1987d951bb8 /server | |
parent | acfd75ee2ec8ad97f8dd54e2ae454257e7284159 (diff) | |
download | vaadin-framework-2fc7554779cb3df2e58dab9057a9b51839e84930.tar.gz vaadin-framework-2fc7554779cb3df2e58dab9057a9b51839e84930.zip |
Update to JSoup 1.11.2 (#10353)
Also update declarative writing to use true instead of "" for empty
attributes because of changed defaults in JSoup. For v7, the tests are
updated instead of touching the implementations.
Diffstat (limited to 'server')
8 files changed, 9 insertions, 8 deletions
diff --git a/server/src/main/java/com/vaadin/ui/AbstractMultiSelect.java b/server/src/main/java/com/vaadin/ui/AbstractMultiSelect.java index 93b0b35403..fdc4f5d4a1 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractMultiSelect.java +++ b/server/src/main/java/com/vaadin/ui/AbstractMultiSelect.java @@ -426,7 +426,7 @@ public abstract class AbstractMultiSelect<T> extends AbstractListing<T> Element element = super.writeItem(design, item, context); if (isSelected(item)) { - element.attr("selected", ""); + element.attr("selected", true); } return element; diff --git a/server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java b/server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java index f9eed7fef3..a1ff9cad69 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java +++ b/server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java @@ -317,7 +317,7 @@ public abstract class AbstractSingleSelect<T> extends AbstractListing<T> Element element = super.writeItem(design, item, context); if (isSelected(item)) { - element.attr("selected", ""); + element.attr("selected", true); } return element; diff --git a/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java b/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java index 991f491084..d658e3db29 100644 --- a/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java +++ b/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java @@ -236,7 +236,7 @@ public class CheckBoxGroup<T> extends AbstractMultiSelect<T> Element elem = super.writeItem(design, item, context); if (!getItemEnabledProvider().test(item)) { - elem.attr("disabled", ""); + elem.attr("disabled", true); } if (isHtmlContentAllowed()) { diff --git a/server/src/main/java/com/vaadin/ui/ComboBox.java b/server/src/main/java/com/vaadin/ui/ComboBox.java index 9fa93b66ac..6c6c55e4fc 100644 --- a/server/src/main/java/com/vaadin/ui/ComboBox.java +++ b/server/src/main/java/com/vaadin/ui/ComboBox.java @@ -747,7 +747,7 @@ public class ComboBox<T> extends AbstractSingleSelect<T> } if (isSelected(item)) { - element.attr("selected", ""); + element.attr("selected", true); } return element; diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java index e39c0f809f..3e75e637d4 100644 --- a/server/src/main/java/com/vaadin/ui/Grid.java +++ b/server/src/main/java/com/vaadin/ui/Grid.java @@ -4539,7 +4539,7 @@ public class Grid<T> extends AbstractListing<T> implements HasComponents, Element tableRow = container.appendElement("tr"); tableRow.attr("item", serializeDeclarativeRepresentation(item)); if (getSelectionModel().isSelected(item)) { - tableRow.attr("selected", ""); + tableRow.attr("selected", true); } for (Column<T, ?> column : getColumns()) { Object value = column.valueProvider.apply(item); diff --git a/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java b/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java index 4eebf13f50..25bc959b1e 100644 --- a/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java +++ b/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java @@ -300,7 +300,7 @@ public class RadioButtonGroup<T> extends AbstractSingleSelect<T> Element elem = super.writeItem(design, item, context); if (!getItemEnabledProvider().test(item)) { - elem.attr("disabled", ""); + elem.attr("disabled", true); } if (isHtmlContentAllowed()) { diff --git a/server/src/main/java/com/vaadin/ui/Tree.java b/server/src/main/java/com/vaadin/ui/Tree.java index 5e642caacc..4e96f4a3e4 100644 --- a/server/src/main/java/com/vaadin/ui/Tree.java +++ b/server/src/main/java/com/vaadin/ui/Tree.java @@ -252,6 +252,7 @@ public class Tree<T> extends Composite /** * Create inner {@link TreeGrid} object. May be overridden in subclasses. + * * @return new {@link TreeGrid} */ protected TreeGrid<T> createTreeGrid() { @@ -971,7 +972,7 @@ public class Tree<T> extends Composite } if (getSelectionModel().isSelected(item)) { - itemElement.attr("selected", ""); + itemElement.attr("selected", true); } Resource icon = getItemIconGenerator().apply(item); diff --git a/server/src/main/java/com/vaadin/ui/TreeGrid.java b/server/src/main/java/com/vaadin/ui/TreeGrid.java index ba570a2160..65329d24c8 100644 --- a/server/src/main/java/com/vaadin/ui/TreeGrid.java +++ b/server/src/main/java/com/vaadin/ui/TreeGrid.java @@ -474,7 +474,7 @@ public class TreeGrid<T> extends Grid<T> tableRow.attr("parent", serializeDeclarativeRepresentation(parent)); } if (getSelectionModel().isSelected(item)) { - tableRow.attr("selected", ""); + tableRow.attr("selected", true); } for (Column<T, ?> column : getColumns()) { Object value = column.getValueProvider().apply(item); |