diff options
| -rw-r--r-- | client/src/com/vaadin/client/extensions/ResponsiveConnector.java | 6 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/extensions/ResponsiveUITest.java | 3 |
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) { |