a1da52d19397eecf35606da80bf69851f97869c6
Merge parents 6dcef0d c5b70d1
kate
  Thu Apr 6 16:54:10 2017 -0700
Merge branch 'master' into barchart-hub

diff --cc src/hg/js/makefile
index e2cf438,65e021b..0280320
--- src/hg/js/makefile
+++ src/hg/js/makefile
@@@ -1,28 -1,28 +1,28 @@@
  kentSrc = ../..
  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 \
 +UCSC_JS_FILES=ajax.js alleles.js autocomplete.js barChart.js edwPersona.js \
      hgCustom.js hgGateway.js hgGtexTrackSettings.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 \
- 	cdwSummaryJs.js
+ 	cdwSummaryJs.js spectrum.min.js
  
  # STATIC files must pass jshint
  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