Explorar el Código

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.
tags/8.3.0.alpha1
Leif Åstrand hace 6 años
padre
commit
2fc7554779

+ 1
- 1
compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java Ver fichero

@@ -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>";
}


+ 1
- 1
compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java Ver fichero

@@ -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

+ 1
- 1
pom.xml Ver fichero

@@ -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 -->

+ 1
- 1
server/src/main/java/com/vaadin/ui/AbstractMultiSelect.java Ver fichero

@@ -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;

+ 1
- 1
server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java Ver fichero

@@ -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;

+ 1
- 1
server/src/main/java/com/vaadin/ui/CheckBoxGroup.java Ver fichero

@@ -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()) {

+ 1
- 1
server/src/main/java/com/vaadin/ui/ComboBox.java Ver fichero

@@ -747,7 +747,7 @@ public class ComboBox<T> extends AbstractSingleSelect<T>
}

if (isSelected(item)) {
element.attr("selected", "");
element.attr("selected", true);
}

return element;

+ 1
- 1
server/src/main/java/com/vaadin/ui/Grid.java Ver fichero

@@ -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);

+ 1
- 1
server/src/main/java/com/vaadin/ui/RadioButtonGroup.java Ver fichero

@@ -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()) {

+ 2
- 1
server/src/main/java/com/vaadin/ui/Tree.java Ver fichero

@@ -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);

+ 1
- 1
server/src/main/java/com/vaadin/ui/TreeGrid.java Ver fichero

@@ -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);

Cargando…
Cancelar
Guardar