diff options
| author | Artur Signell <artur@vaadin.com> | 2013-09-17 14:16:35 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-09-17 14:16:36 +0300 |
| commit | 0f7bcffdb9f753148d1027ff380c9520bb78bfd8 (patch) | |
| tree | a91e21f0060cd097bfa70b8eef91723047d49692 /shared | |
| parent | 70649ac21a40a2b819856da39ebcfb5394ae3280 (diff) | |
| parent | 3a4351f9b777009d8e226d26125f758861ddcbb3 (diff) | |
| download | vaadin-framework-0f7bcffdb9f753148d1027ff380c9520bb78bfd8.tar.gz vaadin-framework-0f7bcffdb9f753148d1027ff380c9520bb78bfd8.zip | |
Merge changes from origin/7.1
de53191 Fix for #12279 (caret jumps when formatting in RTA).
fca0f7a Add <br> as empty representation for webkit (#12490)
6dcece8 Allow creating TextBox or SuggestionPopup when extending VFilterSelect (#12491)
22fcb44 Include unobfuscated file used by test in the war (#12468)
bc90a58 Unified xml files to end with new line
3d01d74 Reduce Ivy resolver spam to a minimum (#12510)
1e73ca8 Fix keystore path to correspond to the Vaadin 7 directory structure (#12520)
dcf9c61 Protect CurrentInstance instances from garbage collection (#12509)
24ffbc2 Allow storing and restoring null instances in CurrentInstance #12509
0d79a84 Added a comment that hopefully explains the NULL_OBJECT #12509
e4d99b3 Use non-obfuscated version of vaadinPush.js when not in production (#12527)
3a31dfe NullPointerException in TableQuery.fetchMetadata() (#11403)
4659797 fixed incorrect name for close-pressed.png for windows in black theme (#12563)
9b05257 Test for push with streaming based on Table
3cafce3 NullPointerException in DateToSqlDateConverter (#12284)
3a4351f Ensure PushConnection is properly cleaned up on disconnect (#12226, #12522)
Change-Id: I44f3d5f003e62e7ab86a22188b22933491226868
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/build.xml | 2 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ApplicationConstants.java | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/shared/build.xml b/shared/build.xml index b0533550d4..73a0a8df7f 100644 --- a/shared/build.xml +++ b/shared/build.xml @@ -61,4 +61,4 @@ <echo>WHAT? No tests for ${module.name}!</echo> </target> -</project>
\ No newline at end of file +</project> diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java index 5ae52615bb..8e66afbb32 100644 --- a/shared/src/com/vaadin/shared/ApplicationConstants.java +++ b/shared/src/com/vaadin/shared/ApplicationConstants.java @@ -79,6 +79,14 @@ public class ApplicationConstants implements Serializable { public static final String VAADIN_PUSH_JS = "vaadinPush.js"; /** + * The name of the debug version of the javascript containing push support. + * The file is located in the VAADIN directory. + * + * @since 7.1.6 + */ + public static final String VAADIN_PUSH_DEBUG_JS = "vaadinPush.debug.js"; + + /** * Name of the parameter used to transmit the CSRF token. */ public static final String CSRF_TOKEN_PARAMETER = "v-csrfToken"; |