From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 19 Dec 2010 21:09:50 +0000 (+0100)
Subject: Update jQuery, add jQuery Tmpl plugin in deps.
X-Git-Tag: xorg/1.1.0~255
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=aa0909f4d3c47cdc98d9eac50602649394c6bbe4;p=platal.git

Update jQuery, add jQuery Tmpl plugin in deps.

Use:
 * jQuery 1.4.4
 * jQuery UI 1.8.7

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/Makefile b/Makefile
index 8448a58..d7ee751 100644
--- a/Makefile
+++ b/Makefile
@@ -173,21 +173,24 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 ##
 ## jquery
 ##
-JQUERY_VERSION=1.4.3
+JQUERY_VERSION=1.4.4
 JQUERY_PLUGINS=color form
 JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS)))
 
-JQUERY_UI_VERSION=1.8.5
+JQUERY_UI_VERSION=1.8.7
 JQUERY_UI=core tabs widget
 JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI)))
 
+JQUERY_TMPL_VERSION=vBeta1.0.0
+JQUERY_TMPL_PATH=htdocs/javascript/jquery.tmpl.js
+
 JSTREE_VERSION=1.0rc2
 JSTREE_PATH=htdocs/javascript/jquery.jstree.js
 
 # TODO: jquery.autocomplete.js should rather be downloaded from an official source. The issue
 # is that the version we use is not available anymore on the Internet, and the latest version
 # we could use is not backward compatible with our current code.
-jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES) $(JSTREE_PATH)
+jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES) $(JQUERY_TMPL_PATH) $(JSTREE_PATH)
 
 htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://jquery.com/src/$(@F)
 htdocs/javascript/jquery-$(JQUERY_VERSION).min.js:
@@ -209,6 +212,14 @@ htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js:
 $(JQUERY_UI_PATHES): htdocs/javascript/jquery.ui.%.js: htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js
 	ln -snf $(<F) $@
 
+htdocs/javascript/jquery.tmpl-$(JQUERY_TMPL_VERSION).js: DOWNLOAD_SRC = https://github.com/jquery/jquery-tmpl/raw/$(JQUERY_TMPL_VERSION)/jquery.tmpl.min.js --no-check-certificate
+htdocs/javascript/jquery.tmpl-$(JQUERY_TMPL_VERSION).js:
+	@-rm htdocs/javascript/jquery.tmpl*.js
+	@$(download)
+
+$(JQUERY_TMPL_PATH): htdocs/javascript/jquery.tmpl-$(JQUERY_TMPL_VERSION).js
+	ln -snf $(<F) $@
+
 $(JSTREE_PATH):
 	rm -f htdocs/javascript/jquery.jstree-*.js
 	mkdir spool/tmp/jstree