aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Pòˆntelin <teemu@vaadin.com>2014-06-01 23:57:25 +0300
committerVaadin Code Review <review@vaadin.com>2014-06-02 17:07:47 +0000
commit113c6321ea58d934b3cb07cec8e730532181abc7 (patch)
tree13efc1f06d02cf661b61992679304132bc9f03e4
parent154a482c56c79315249f16d4ff2db1944de590dd (diff)
downloadvaadin-framework-113c6321ea58d934b3cb07cec8e730532181abc7.tar.gz
vaadin-framework-113c6321ea58d934b3cb07cec8e730532181abc7.zip
Fix for handling a breakpoint with 0 as the lower bound (#13588)
Added explicit isNaN checks to the results of parseInt function because JavaScript would always convert 0 to false. Change-Id: Ic904c321c0195ce50d9a498005459425b0c30d4c
-rw-r--r--client/src/com/vaadin/client/extensions/ResponsiveConnector.java6
-rw-r--r--uitest/src/com/vaadin/tests/extensions/ResponsiveUITest.java3
2 files changed, 6 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/extensions/ResponsiveConnector.java b/client/src/com/vaadin/client/extensions/ResponsiveConnector.java
index b2230a4846..1392a1a49a 100644
--- a/client/src/com/vaadin/client/extensions/ResponsiveConnector.java
+++ b/client/src/com/vaadin/client/extensions/ResponsiveConnector.java
@@ -383,15 +383,15 @@ public class ResponsiveConnector extends AbstractExtensionConnector implements
var min = parseInt(bp[1]);
var max = parseInt(bp[2]);
- if(min && max) {
+ if(!isNaN(min) && !isNaN(max)) {
if(min <= size && size <= max) {
ranges += " " + bp[1] + "-" + bp[2];
}
- } else if (min) {
+ } else if (!isNaN(min)) {
if(min <= size) {
ranges += " " + bp[1] + "-";
}
- } else if (max) {
+ } else if (!isNaN(max)) {
if (size <= max) {
ranges += " -" + bp[2];
}
diff --git a/uitest/src/com/vaadin/tests/extensions/ResponsiveUITest.java b/uitest/src/com/vaadin/tests/extensions/ResponsiveUITest.java
index 6827bd0a5d..f7cbd9477c 100644
--- a/uitest/src/com/vaadin/tests/extensions/ResponsiveUITest.java
+++ b/uitest/src/com/vaadin/tests/extensions/ResponsiveUITest.java
@@ -76,6 +76,9 @@ public class ResponsiveUITest extends MultiBrowserTest {
assertEquals("-200px",
$(".v-csslayout-grid.first").getAttribute("width-range"));
+ moveSplitter(-100);
+ assertEquals("0-100px",
+ $(".v-csslayout-grid.second").getAttribute("width-range"));
}
private void moveSplitter(int xOffset) {