338eba4f4aea343d44e8f8af1616e3630de9eaa4
Merge parents 353ca9f 1b7f927
kent
  Wed Aug 5 09:28:18 2015 -0700
Fixing simple merge conflict.

diff --cc src/hg/js/makefile
index 6211ad9,67b2bc4..58f3dcc
--- src/hg/js/makefile
+++ src/hg/js/makefile
@@@ -1,47 -1,45 +1,47 @@@
  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
  
  # 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.imgareaselect.js jquery-ui.js jquery.contextmenu.js \
 -    jquery.cookie.js jquery.watermark.js jquery.watermarkinput.js \
 +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 
+     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
  
  jshint:
  	${JSHINT} ${UCSC_JS_FILES} ${STATIC_FILES}
  
  doInstall: jshint ${SUBDIRS:%=%.doInstall}
  	@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