5e4838f28e48e8175b933f5c2f459785add6f1cb
Merge parents 3a3ec8b 45e0e7a
galt
  Wed Feb 15 15:30:20 2017 -0800
fixed merge conflicts after pull from master. mostly fixing missing semi-colons and newlines on short bits of js.

diff --cc src/hg/hgBlat/hgBlat.c
index 69d1b83,58676cc..9aae962
--- src/hg/hgBlat/hgBlat.c
+++ src/hg/hgBlat/hgBlat.c
@@@ -216,32 -216,35 +216,32 @@@
  
  
  
  void printLuckyRedirect(char *browserUrl, struct psl *psl, char *database, char *pslName, 
  			char *faName, char *uiState, char *unhideTrack)
  /* Print out a very short page that redirects us. */
  {
  char url[1024];
  safef(url, sizeof(url), "%s?position=%s:%d-%d&db=%s&ss=%s+%s&%s%s",
        browserUrl, psl->tName, psl->tStart + 1, psl->tEnd, database, 
        pslName, faName, uiState, unhideTrack);
  /* htmlStart("Redirecting"); */
  /* Odd it appears that we've already printed the Content-Typ:text/html line
     but I can't figure out where... */
  htmStart(stdout, "Redirecting"); 
- jsInlineF("location.replace('%s');", url);
- printf("<noscript>No javascript support:<br>Click <a href='%s'>here</a> for browser.</noscript>", url);
 -char javascript[1024];
 -safef(javascript, sizeof javascript,
 -    "location.replace('%s');\n", url);
 -jsInline(javascript);
++jsInlineF("location.replace('%s');\n", url);
+ printf("<noscript>No javascript support:<br>Click <a href='%s'>here</a> for browser.</noscript>\n", url);
  htmlEnd();
  
  }
  
  
  /* forward declaration to reduce churn */
  static void getCustomName(char *database, struct cart *cart, struct psl *psl, char **pName, char **pDescription);
  
  void showAliPlaces(char *pslName, char *faName, char *customText, char *database, 
             enum gfType qType, enum gfType tType, 
             char *organism, boolean feelingLucky)
  /* Show all the places that align. */
  {
  boolean useBigPsl = cfgOptionBooleanDefault("useBlatBigPsl", FALSE);
  struct lineFile *lf = pslFileOpen(pslName);