diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-06-03 16:00:34 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-06-03 16:01:52 +0300 |
| commit | 6c36784ad2853d0187f69ef8f023717aa7bade12 (patch) | |
| tree | 5ed8951220c767881420e77c307a945104425c47 /WebContent/VAADIN/vaadinPush.js.tpl | |
| parent | 34e6c60a5a746c0306c3a84ae8d6c21dfd84d878 (diff) | |
| parent | 84bf5a77e678f6d8a73f71d42fea2300b4f174cc (diff) | |
| download | vaadin-framework-6c36784ad2853d0187f69ef8f023717aa7bade12.tar.gz vaadin-framework-6c36784ad2853d0187f69ef8f023717aa7bade12.zip | |
Merge commit '34e6c60a5a746c0306c3a84ae8d6c21dfd84d878' into 7.1
#11448 is fixed in a different way for 7.1 because the tooltip event
handling has been slightly refactored.
Change-Id: I50db48ffdce22cdf6598daafcb022fc43ed11cf4
Diffstat (limited to 'WebContent/VAADIN/vaadinPush.js.tpl')
| -rw-r--r-- | WebContent/VAADIN/vaadinPush.js.tpl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebContent/VAADIN/vaadinPush.js.tpl b/WebContent/VAADIN/vaadinPush.js.tpl new file mode 100644 index 0000000000..3928fba1b6 --- /dev/null +++ b/WebContent/VAADIN/vaadinPush.js.tpl @@ -0,0 +1,8 @@ +@jquery.js@ +window.jQueryVaadin = window.jQuery.noConflict(true); +(function(jQuery, undefined) { + @jquery.atmosphere.js@ +})(jQueryVaadin); +if (console) { + console.log("Vaadin push loaded"); +}
\ No newline at end of file |