From 0d1bbc946c5372994ef5587438023e42ddcfa54c Mon Sep 17 00:00:00 2001
From: Pekka Hyvönen <pekka@vaadin.com>
Date: Wed, 13 May 2015 14:56:20 +0300
Subject: Fixes regression in Notifications and tests (#14872)

Change-Id: Ifa52508f5555c47b778cb7f80aa09f665b03b8d4
---
 client/src/com/vaadin/client/ApplicationConnection.java | 10 ++++++++--
 client/src/com/vaadin/client/ui/VNotification.java      | 17 ++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'client/src')

diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index af86818fb3..3a8d69f25a 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -1285,12 +1285,18 @@ public class ApplicationConnection implements HasHandlers {
 
         StringBuilder html = new StringBuilder();
         if (caption != null) {
-            html.append("<h1>");
+            html.append("<h1 class='");
+            html.append(VNotification.getDependentStyle(this,
+                    VNotification.CAPTION));
+            html.append("'>");
             html.append(caption);
             html.append("</h1>");
         }
         if (message != null) {
-            html.append("<p>");
+            html.append("<p class='");
+            html.append(VNotification.getDependentStyle(this,
+                    VNotification.DESCRIPTION));
+            html.append("'>");
             html.append(message);
             html.append("</p>");
         }
diff --git a/client/src/com/vaadin/client/ui/VNotification.java b/client/src/com/vaadin/client/ui/VNotification.java
index 2892d4e3ac..4f0c2eb625 100644
--- a/client/src/com/vaadin/client/ui/VNotification.java
+++ b/client/src/com/vaadin/client/ui/VNotification.java
@@ -63,8 +63,8 @@ public class VNotification extends VOverlay {
     private static final String STYLENAME_POSITION_CENTER = "v-position-center";
     private static final String STYLENAME_POSITION_ASSISTIVE = "v-position-assistive";
 
-    private static final String CAPTION = "caption";
-    private static final String DESCRIPTION = "description";
+    public static final String CAPTION = "caption";
+    public static final String DESCRIPTION = "description";
 
     /**
      * Position that is only accessible for assistive devices, invisible for
@@ -532,7 +532,18 @@ public class VNotification extends VOverlay {
                 html, position, style);
     }
 
-    private static String getDependentStyle(ApplicationConnection client,
+    /**
+     * Meant for internal usage only.
+     * 
+     * @since 7.5.0
+     * @param client
+     *            application connection
+     * @param style
+     *            the dependent style name
+     * @return the given dependent style name prefixed with current notification
+     *         primary style
+     */
+    public static String getDependentStyle(ApplicationConnection client,
             String style) {
         VNotification notification = createNotification(-1, client
                 .getUIConnector().getWidget());
-- 
cgit v1.2.3