summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <legioth@gmail.com>2017-11-23 07:54:53 +0200
committerAleksi Hietanen <aleksi@vaadin.com>2017-11-23 07:54:53 +0200
commit2fc7554779cb3df2e58dab9057a9b51839e84930 (patch)
tree6756c03d2f8a86082af175211985a1987d951bb8
parentacfd75ee2ec8ad97f8dd54e2ae454257e7284159 (diff)
downloadvaadin-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.
-rw-r--r--compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java2
-rw-r--r--compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java2
-rw-r--r--pom.xml2
-rw-r--r--server/src/main/java/com/vaadin/ui/AbstractMultiSelect.java2
-rw-r--r--server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java2
-rw-r--r--server/src/main/java/com/vaadin/ui/CheckBoxGroup.java2
-rw-r--r--server/src/main/java/com/vaadin/ui/ComboBox.java2
-rw-r--r--server/src/main/java/com/vaadin/ui/Grid.java2
-rw-r--r--server/src/main/java/com/vaadin/ui/RadioButtonGroup.java2
-rw-r--r--server/src/main/java/com/vaadin/ui/Tree.java3
-rw-r--r--server/src/main/java/com/vaadin/ui/TreeGrid.java2
11 files changed, 12 insertions, 11 deletions
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
index be22583697..fb6b368d5e 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java
@@ -158,7 +158,7 @@ public class AbstractSelectDeclarativeTest
private String getDesignForInlineData() {
return "<vaadin7-list-select>\n"
+ " <option icon='http://some.url/icon.png'>Value 1</option>\n" //
- + " <option selected>Value 2</option>\n"//
+ + " <option selected=''>Value 2</option>\n"//
+ "</vaadin7-list-select>";
}
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java
index 455ffdd782..aed67d9c5b 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java
@@ -70,7 +70,7 @@ public class OptionGroupDeclarativeTest
"<vaadin7-option-group>"
+ "<option>foo</option>"
+ "<option>bar</option>"
- + "<option disabled>baz</option>"
+ + "<option disabled=''>baz</option>"
+ "<option>bang</option>"
+ "</vaadin7-option-group>";
//@formatter:on
diff --git a/pom.xml b/pom.xml
index fa58d125ec..43047fa10a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<!-- Used in OSGi manifests -->
<javax.validation.version>1.0.0.GA</javax.validation.version>
- <jsoup.version>1.8.3</jsoup.version>
+ <jsoup.version>1.11.2</jsoup.version>
<javax.portlet.version>2.0</javax.portlet.version>
<vaadin.sass.version>0.9.13</vaadin.sass.version>
<!-- Note that this should be kept in sync with the class Constants -->
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);