From: Leif Åstrand <leif@vaadin.com>
Date: Thu, 20 Nov 2014 13:23:44 +0000 (+0200)
Subject: Don't show loading spinner if there are no tabs (#15241)
X-Git-Tag: 7.5.0.beta1~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7e122bed24ff0d91039fcc1c4083b317f51a0af0;p=vaadin-framework.git

Don't show loading spinner if there are no tabs (#15241)

Change-Id: Ib2f08fc036d0f9940a865353c43d2433767df1fc
---

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"));
+    }
+
 }