From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 7 Mar 2010 17:55:21 +0000 (+0100)
Subject: Update jQuery to 1.4.2, downgrade jQuery UI to 1.6.
X-Git-Tag: xorg/1.0.0~332^2~84
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=07ea8c0ea91aaa7c628150cf56123cb450a233f9;p=platal.git

Update jQuery to 1.4.2, downgrade jQuery UI to 1.6.

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

diff --git a/Makefile b/Makefile
index e928263..dd60907 100644
--- a/Makefile
+++ b/Makefile
@@ -168,11 +168,11 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 ##
 ## jquery
 ##
-JQUERY_VERSION=1.3.2
+JQUERY_VERSION=1.4.2
 JQUERY_PLUGINS=color
 JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS)))
 
-JQUERY_UI_VERSION=1.7.2
+JQUERY_UI_VERSION=1.6
 JQUERY_UI=core tabs
 JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI)))
 
@@ -183,13 +183,15 @@ jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES)
 
 htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://jquery.com/src/$(@F)
 htdocs/javascript/jquery-$(JQUERY_VERSION).min.js:
+	@-rm htdocs/javascript/jquery-*.min.js
 	@$(download)
 
 htdocs/javascript/jquery.js: htdocs/javascript/jquery-$(JQUERY_VERSION).min.js
-	ln -snf $< $@
+	ln -snf $(<F) $@
 
 $(JQUERY_PLUGINS_PATHES): DOWNLOAD_SRC = http://plugins.jquery.com/files/$(@F).txt
 $(JQUERY_PLUGINS_PATHES):
+	@-rm htdocs/javascript/jquery.ui*.$*.js
 	@$(download)
 
 htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js: DOWNLOAD_SRC = http://jquery-ui.googlecode.com/svn/tags/$(JQUERY_UI_VERSION)/ui/ui.$*.js
@@ -197,7 +199,7 @@ htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js:
 	@$(download)
 
 $(JQUERY_UI_PATHES): htdocs/javascript/jquery.ui.%.js: htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js
-	ln -snf $< $@
+	ln -snf $(<F) $@
 
 ################################################################################