915f56e3f34f66d58bf6573dc4dfddd068bd4090
angie
Tue Apr 19 13:36:48 2016 -0700
Simplify the generation of hgGateway's dbDbTaxonomy tree info and support mirrors better: new hg.conf setting hgGateway.dbDbTaxonomy enables tree display and specifies relative URL to file. Instead of dbDbTaxonomy.{hgwdev,rr}.js, there is only one dbDbTaxonomy.js, built from hgcentraltest (hgwdev). hgGateway.c's HTML output includes JS encoding the set of active genomes+taxIds. hgGateway.js uses that to prune the tree so it contains only active genomes; now we can use the hgwdev tree on the RR and see only RR species. Also updated dbDbTaxonomy.js to get the latest hgwdev species as of 4/18/16.
refs #15277
diff --git src/hg/js/makefile src/hg/js/makefile
index 069d2ce..1207f1a 100644
--- src/hg/js/makefile
+++ src/hg/js/makefile
@@ -1,49 +1,49 @@
include ../../inc/common.mk
include install.mk
SUBDIRS= external model react
include subdirs.mk
# UCSC js files must pass jshint
UCSC_JS_FILES=ajax.js alleles.js autocomplete.js edwPersona.js \
hgCustom.js hgGateway.js hgHubConnect.js hgTracks.js \
hgVarAnnogrator.js hui.js jsHelper.js utils.js ddcl.js subCfg.js \
encodeProject.js encodeDataSummary.js encodeDataMatrix.js encodeChipMatrix.js encodeMatrix.js d3.dendrograms.js
# STATIC files must pass jshint
-STATIC_FILES=staticDoc.js dbDbTaxonomy.hgwdev.js dbDbTaxonomy.rr.js
+STATIC_FILES=staticDoc.js dbDbTaxonomy.js
# JQUERY files and other third pary files which have NOT BEEN TOUCHED by UCSC
JQUERY_FILES_UNTOUCHED= \
d3pie.min.js \
jquery.js jquery.imgareaselect.js jquery-ui.js jquery.contextmenu.js \
jquery.cookie.js jquery.watermark.js jquery.watermarkinput.js jquery.ui.colorPicker.js \
jquery.floatheader.js jquery.rotateTableCellContent.js jquery.plugins.js \
jquery.validate.min.js jquery.history.js mousetrap.min.js
# JQUERY or other third pary files which HAVE BEEN MODIFIED by UCSC
JQUERY_FILES_MODIFIED=jquery.tablednd.js ui.dropdownchecklist.js
JQUERY_FILES=${JQUERY_FILES_UNTOUCHED} ${JQUERY_FILES_MODIFIED}
# SYMLINKED files are include in CGIs via a version or timestamped symlink
# to force client side updates
SYMLINKED_FILES=${UCSC_JS_FILES} ${JQUERY_FILES}
ifdef LOWELAB
# LOWE lab files should be forced through jshint (but currently aren't)
SYMLINKED_FILES += lowetooltip.js loweautocomplete.js
endif
jshintTop:
${JSHINT} ${UCSC_JS_FILES} ${STATIC_FILES}
doInstallTop: jshintTop
@mkdir -p ${DEST}/
../utils/cpAndLinkToResourceFiles.pl ${extra} -exclude='makefile' \
-versionFile=../inc/versionInfo.h -destDir=${DEST} ${SYMLINKED_FILES}
for file in ${STATIC_FILES}; do \
rsync -a $$file ${DEST}/; \
done
doInstall: doInstallTop ${SUBDIRS:%=%.doInstall}