diff options
| author | Leif Åstrand <leif@vaadin.com> | 2014-11-20 15:23:44 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-05-13 13:24:50 +0000 |
| commit | 7e122bed24ff0d91039fcc1c4083b317f51a0af0 (patch) | |
| tree | 6d877d2f51dc16fc01690283c553432626ae0b1a | |
| parent | c9fe8c40d3900b7fdf72d239ad02e8e81f0fa091 (diff) | |
| download | vaadin-framework-7e122bed24ff0d91039fcc1c4083b317f51a0af0.tar.gz vaadin-framework-7e122bed24ff0d91039fcc1c4083b317f51a0af0.zip | |
Don't show loading spinner if there are no tabs (#15241)
Change-Id: Ib2f08fc036d0f9940a865353c43d2433767df1fc
| -rw-r--r-- | client/src/com/vaadin/client/ui/VTabsheet.java | 1 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java index a02679a0fc..8e4f3cb643 100644 --- a/client/src/com/vaadin/client/ui/VTabsheet.java +++ b/client/src/com/vaadin/client/ui/VTabsheet.java @@ -909,7 +909,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware deco = DOM.createDiv(); - addStyleDependentName("loading"); // Indicate initial progress tb.setStyleName(CLASSNAME + "-tabs"); DOM.setElementProperty(contentNode, "className", CLASSNAME + "-content"); DOM.setElementProperty(deco, "className", CLASSNAME + "-deco"); diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java index cebb00c11b..6d0b78debd 100644 --- a/uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java +++ b/uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java @@ -15,7 +15,10 @@ */ package com.vaadin.tests.components.tabsheet; +import org.junit.Assert; import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -27,4 +30,14 @@ public class EmptyTabSheetTest extends MultiBrowserTest { compareScreen("empty"); } + @Test + public void emptyTabSheetValo() { + openTestURL("theme=valo"); + + WebElement deco = getDriver().findElement( + By.className("v-tabsheet-deco")); + + Assert.assertEquals("none", deco.getCssValue("display")); + } + } |