summaryrefslogtreecommitdiffstats
path: root/WebContent/VAADIN/vaadinPush.js.tpl
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-04-17 19:16:59 +0300
committerArtur Signell <artur@vaadin.com>2013-04-17 20:09:08 +0300
commitcdcdc115b79f0773c2d140e43f58cfe9cb4b1cdb (patch)
treec3bb8f44a3918c4e4a5e3db903d6cda5d070fd0e /WebContent/VAADIN/vaadinPush.js.tpl
parent4400b1b62587e74073aac7f3c60710ac535795a5 (diff)
downloadvaadin-framework-cdcdc115b79f0773c2d140e43f58cfe9cb4b1cdb.tar.gz
vaadin-framework-cdcdc115b79f0773c2d140e43f58cfe9cb4b1cdb.zip
Build a minified version of vaadinPush.js in vaadin-push.jar (#11630)
* Replaced jquery and jquery.atmosphere.js with original, unmodified versions * Added vaadinPush.js build target to ide.xml and push/build.xml * Uses yuicompressor to compress the resulting push javascript Change-Id: I59ba9c2bbf74e05d10325d38efdb106b638cd8e7
Diffstat (limited to 'WebContent/VAADIN/vaadinPush.js.tpl')
-rw-r--r--WebContent/VAADIN/vaadinPush.js.tpl8
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