]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 282df27)
Fixed primary stylename handling in Accordion #9900 10/110/1
authorJohn Ahlroos <john@vaadin.com>
Wed, 10 Oct 2012 14:46:57 +0000 (17:46 +0300)
committerJohn Ahlroos <john@vaadin.com>
Wed, 10 Oct 2012 14:46:57 +0000 (17:46 +0300)
Change-Id: Iab4e8c8d0a0c98b770b7970fd1c099698e6a6531

client/src/com/vaadin/client/ui/accordion/VAccordion.java patch | blob | history
uitest/src/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.html [new file with mode: 0644] patch | blob
uitest/src/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java [new file with mode: 0644] patch | blob

diff --git a/client/src/com/vaadin/client/ui/accordion/VAccordion.java b/client/src/com/vaadin/client/ui/accordion/VAccordion.java
index e906cf3cce996a971f5992aeb558d98a2c78d72b..0fbbcf5780fcf3a779ebd5b1a0308d7e6136c6e7 100644 (file)
--- a/client/src/com/vaadin/client/ui/accordion/VAccordion.java
+++ b/client/src/com/vaadin/client/ui/accordion/VAccordion.java
@@ -87,6 +87,26 @@ public class VAccordion extends VTabsheetBase {
         }
     }
 
+    @Override
+    public void setStylePrimaryName(String style) {
+        updateStyleNames(style);
+    }
+
+    @Override
+    public void setStyleName(String style) {
+        updateStyleNames(style);
+    }
+
+    protected void updateStyleNames(String primaryStyleName) {
+        super.setStyleName(primaryStyleName);
+        for (Widget w : getChildren()) {
+            if (w instanceof StackItem) {
+                StackItem item = (StackItem) w;
+                item.updateStyleNames(primaryStyleName);
+            }
+        }
+    }
+
     /**
      * This method tries to find out if a tab has been rendered with a different
      * index previously. If this is the case it re-orders the children so the
@@ -359,15 +379,23 @@ public class VAccordion extends VTabsheetBase {
             DOM.appendChild(getElement(), captionNode);
             DOM.appendChild(getElement(), content);
 
-            getElement().addClassName(CLASSNAME + "-item");
-            captionNode.addClassName(CLASSNAME + "-item-caption");
-            content.addClassName(CLASSNAME + "-item-content");
+            updateStyleNames(VAccordion.this.getStylePrimaryName());
 
             touchScrollHandler.addElement(getContainerElement());
 
             close();
         }
 
+        private void updateStyleNames(String primaryStyleName) {
+            content.removeClassName(getStylePrimaryName() + "-content");
+            captionNode.removeClassName(getStylePrimaryName() + "-caption");
+
+            setStylePrimaryName(primaryStyleName + "-item");
+
+            captionNode.addClassName(getStylePrimaryName() + "-caption");
+            content.addClassName(getStylePrimaryName() + "-content");
+        }
+
         @Override
         public void onBrowserEvent(Event event) {
             onSelectTab(this);
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.html b/uitest/src/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.html
new file mode 100644 (file)
index 0000000..6f888f7
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.html
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8888/" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+    <td>open</td>
+    <td>/run/com.vaadin.tests.components.accordion.AccordionPrimaryStylenames?restartApplication</td>
+    <td></td>
+</tr>
+<tr>
+    <td>assertNotCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]</td>
+    <td>v-accordion</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]</td>
+    <td>my-accordion</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]</td>
+    <td>my-accordion-item</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]</td>
+    <td>my-accordion-item-first</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]</td>
+    <td>my-accordion-item-open</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]/domChild[0]</td>
+    <td>my-accordion-item-caption</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]/domChild[1]</td>
+    <td>my-accordion-item-content</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[1]</td>
+    <td>my-accordion-item</td>
+</tr>
+<tr>
+    <td>click</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
+    <td></td>
+</tr>
+<tr>
+    <td>assertNotCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]</td>
+    <td>my-accordion</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]</td>
+    <td>my-second-accordion</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]</td>
+    <td>my-second-accordion-item</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]</td>
+    <td>my-second-accordion-item-first</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]</td>
+    <td>my-second-accordion-item-open</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]/domChild[0]</td>
+    <td>my-second-accordion-item-caption</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[0]/domChild[1]</td>
+    <td>my-second-accordion-item-content</td>
+</tr>
+<tr>
+    <td>assertCSSClass</td>
+    <td>vaadin=runcomvaadintestscomponentsaccordionAccordionPrimaryStylenames::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VAccordion[0]/domChild[1]</td>
+    <td>my-second-accordion-item</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java b/uitest/src/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java
new file mode 100644 (file)
index 0000000..bd7f047
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/accordion/AccordionPrimaryStylenames.java
@@ -0,0 +1,38 @@
+package com.vaadin.tests.components.accordion;
+
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Accordion;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.NativeButton;
+
+public class AccordionPrimaryStylenames extends TestBase {
+
+    @Override
+    protected void setup() {
+        final Accordion acc = new Accordion();
+        acc.addComponent(new NativeButton("First tab"));
+        acc.addComponent(new NativeButton("Second tab"));
+        acc.setPrimaryStyleName("my-accordion");
+        addComponent(acc);
+
+        addComponent(new Button("Set primary stylename",
+                new Button.ClickListener() {
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        acc.setPrimaryStyleName("my-second-accordion");
+                    }
+                }));
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Accordion should work with primary stylenames both initially and dynamically";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 9900;
+    }
+
+}
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework