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/lib/jsHelper.c
index 158d385,50cf6b1..e80ae35
--- src/hg/lib/jsHelper.c
+++ src/hg/lib/jsHelper.c
@@@ -33,31 -33,34 +33,31 @@@
  void jsInit()
  /* If this is the first call, set window.onload to the operations
   * performed upon loading a page and print supporting javascript.
   * Currently this just sets the page vertical position if specified on
   * CGI, and includes jsHelper.js.
   * Subsequent calls do nothing, so this can be called many times. */
  {
  if (! jsInited)
      {
      // jsh_pageVertPos trick taken from
      // http://www.softcomplex.com/docs/get_window_size_and_scrollbar_position.html
      puts("<INPUT TYPE=HIDDEN NAME=\"jsh_pageVertPos\" VALUE=0>");
      int pos = cgiOptionalInt("jsh_pageVertPos", 0);
      if (pos > 0)
  	{
- 	jsInlineF("window.onload = function () { window.scrollTo(0, %d); }", pos);
 -	char javascript[1024];
 -	safef(javascript, sizeof javascript,
 -	       "window.onload = function () { window.scrollTo(0, %d); }\n", pos);
 -	jsInline(javascript);
++	jsInlineF("window.onload = function () { window.scrollTo(0, %d); }\n", pos);
  	}
      jsInited = TRUE;
      jsIncludeFile("jsHelper.js", NULL);
      }
  }
  
  struct dyString *jsOnChangeStart()
  /* Start up an onChange string */
  {
  struct dyString *dy = dyStringNew(1024);
  return dy;
  }
  
  char *jsOnChangeEnd(struct dyString **pDy)
  /* Finish up javascript onChange command. */
@@@ -109,36 -117,40 +109,36 @@@
  void jsMakeTrackingRadioButton(char *cgiVar, char *jsVar,
  	char *val, char *selVal)
  /* Make a radio button that also sets tracking variable
   * in javascript. */
  {
  jsMakeTrackingRadioButtonExtraHtml(cgiVar, jsVar, val, selVal, NULL);
  }
  
  void jsMakeTrackingCheckBox(struct cart *cart,
  	char *cgiVar, char *jsVar, boolean usualVal)
  /* Make a check box filling in with existing value and
   * putting a javascript tracking variable on it. */
  {
  char buf[256];
  boolean oldVal = cartUsualBoolean(cart, cgiVar, usualVal);
- jsInlineF("var %s=%d;", jsVar, oldVal);
 -char javascript[1024];
 -safef(javascript, sizeof javascript,
 -    "var %s=%d;\n", jsVar, oldVal);
 -jsInline(javascript);
++jsInlineF("var %s=%d;\n", jsVar, oldVal);
  hPrintf("<INPUT TYPE=CHECKBOX NAME='%s' ID='%s' VALUE=1", cgiVar, cgiVar);
  if (oldVal)
      hPrintf(" CHECKED");
 -safef(javascript, sizeof javascript, "%s=(%s+1)%%2;", jsVar, jsVar);
 -jsOnEventById("click", cgiVar, javascript);
  hPrintf(">");
 +jsOnEventByIdF("click", cgiVar, "%s=(%s+1)%%2;", jsVar, jsVar);
  safef(buf, sizeof(buf), "%s%s", cgiBooleanShadowPrefix(), cgiVar);
  cgiMakeHiddenVar(buf, "0");
  }
  
  void jsTrackedVarCarryOver(struct dyString *dy, char *cgiVar, char *jsVar)
  /* Carry over tracked variable (radio button?) to hidden form. */
  {
  dyStringPrintf(dy, "document.hiddenForm.%s.value=%s; ", cgiVar, jsVar);
  }
  
  char *jsRadioUpdate(char *cgiVar, char *jsVar, char *val)
  /* Make a little javascript to check and uncheck radio buttons
   * according to new value.  To use this you must have called
   * jsInit somewhere, and also must use jsMakeTrackingRadioButton
   * to make the buttons. */