a977f696e4c55a22418ceb495e123a6bfdfebb73
Merge parents f2bd679 71d4272
kent
  Thu Apr 25 11:16:02 2013 -0700
Fixing merge conflict - Tim also added a new javascript module.
diff --cc src/hg/js/makefile
index 298b18f,98a3b48..9063a87
--- src/hg/js/makefile
+++ src/hg/js/makefile
@@@ -1,48 -1,47 +1,48 @@@
  include ../../inc/common.mk
  
  # recursive target to do install to DEST, with extra excludes EXCL.
  
  JQUERY_FILES=jquery.js jquery.tablednd.js \
      jquery.imgareaselect.js jquery-ui.js jquery.contextmenu.js \
      ui.dropdownchecklist.js \
      jquery.cookie.js jquery.watermarkinput.js \
      jquery.floatheader.js jquery.rotateTableCellContent.js jquery.plugins.js \
      jquery.validate.min.js
      
- JS_FILES=ajax.js autocomplete.js edwPersona.js \
 -JS_FILES=ajax.js alleles.js autocomplete.js hgCustom.js hgGateway.js hgHubConnect.js hgTracks.js \
++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 \
      ${JQUERY_FILES}
  
  STATIC_FILES=staticDoc.js jquery.js
  
  ifdef LOWELAB
      JS_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:
  	${GITUP} 
  	${MAKE} doInstall DEST=${DOCUMENTROOT}/js
  
  clean:
  
  compile:
  
  install:
  	${MAKE} doInstall DEST=${DOCUMENTROOT}/js
  
  doInstall:
  	@mkdir -p ${DEST}/
  	../utils/cpAndLinkToResourceFiles.pl -exclude='makefile' -versionFile=../inc/versionInfo.h -destDir=${DEST} ${JS_FILES}