X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=6a8a175e4515514cf238fb235d0bfa86a4cc6fe3;hb=0cec3fee1267f46d651380f8c38cc616c3ac7268;hp=c2dc5460312b0312d012d64bd5086ba822953a42;hpb=e9cd8d9c409feca6cbfa1ff0125a033fc33a604d;p=platal.git diff --git a/Makefile b/Makefile index c2dc546..6a8a175 100644 --- a/Makefile +++ b/Makefile @@ -174,7 +174,7 @@ JQUERY_PLUGINS=color form JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS))) JQUERY_UI_VERSION=1.8.10 -JQUERY_UI=core widget tabs datepicker +JQUERY_UI=core widget tabs datepicker autocomplete position JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI))) JQUERY_TMPL_VERSION=vBeta1.0.0 @@ -183,12 +183,9 @@ 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.xorg.js htdocs/javascript/jquery.ui.xorg.js $(JSTREE_PATH) -htdocs/javascript/jquery.xorg.js: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_TMPL_PATH) htdocs/javascript/jquery.autocomplete.js +htdocs/javascript/jquery.xorg.js: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_TMPL_PATH) cat $^ > $@ htdocs/javascript/jquery.ui.xorg.js: $(JQUERY_UI_PATHES) htdocs/javascript/jquery.ui.datepicker-fr.js @@ -245,8 +242,9 @@ $(JSTREE_PATH): ## maps: htdocs/javascript/markerclusterer.js +## Try and use taged version asap (from http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/…). htdocs/javascript/markerclusterer.js: - wget http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_compiled.js -O htdocs/javascript/markerclusterer.js + wget "http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/src/markerclusterer_compiled.js?r=308" -O htdocs/javascript/markerclusterer.js ## ## lists rpc