c5ade98e80989e26422294f3d668fbe3ebbd1b20 tdreszer Wed Jun 18 12:40:38 2014 -0700 In code review I noticed two files that were defined as both JQUERY_UNTOUCHED and JQUERY_MODIFIED. Both belong only on MODIFIED list. diff --git src/hg/js/makefile src/hg/js/makefile index b66622c..2fc2563 100644 --- src/hg/js/makefile +++ src/hg/js/makefile @@ -1,48 +1,45 @@ include ../../inc/common.mk # recursive target to do install to DEST, with extra excludes EXCL. # 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 utils.js ddcl.js subCfg.js \ encodeProject.js encodeDataSummary.js encodeDataMatrix.js encodeChipMatrix.js encodeMatrix.js # STATIC files must pass jshint STATIC_FILES=staticDoc.js # JQUERY files and other third pary files which have NOT BEEN TOUCHED by UCSC -JQUERY_FILES_UNTOUCHED=jquery.js jquery.tablednd.js \ - jquery.imgareaselect.js jquery-ui.js jquery.contextmenu.js \ - ui.dropdownchecklist.js \ +JQUERY_FILES_UNTOUCHED=jquery.js jquery.imgareaselect.js jquery-ui.js jquery.contextmenu.js \ jquery.cookie.js jquery.watermarkinput.js \ jquery.floatheader.js jquery.rotateTableCellContent.js jquery.plugins.js \ jquery.validate.min.js jquery.history.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) - #UCSC_JS_FILES += lowetooltip.js loweautocomplete.js SYMLINKED_FILES += lowetooltip.js loweautocomplete.js endif user: if test -d ${DOCUMENTROOT}-${USER}; then \ ${MAKE} doInstall DEST=${DOCUMENTROOT}-${USER}/js; \ else \ ${MAKE} doInstall DEST=${DOCUMENTROOT}/js/${USER}; \ fi alpha: ${GITUP} ${MAKE} doInstall DEST=${DOCUMENTROOT}/js beta: