From 4de32bcb0e31d7ee6622f755f60db006db9d61d4 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Thu, 20 Nov 2014 15:23:44 +0200 Subject: Don't show loading spinner if there are no tabs (#15241) Change-Id: I42592c828b49bc977693d1252326c6d9c6a45a07 --- client/src/com/vaadin/client/ui/VTabsheet.java | 1 - .../vaadin/tests/components/tabsheet/EmptyTabSheetTest.java | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) 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")); + } + } -- cgit v1.2.3