2fcabe1a7881fefe2f84adb2aa140ce916d883da kate Mon Apr 17 16:04:16 2017 -0700 Fix event handling on checkbox. refs #18736 diff --git src/hg/lib/barChartUi.c src/hg/lib/barChartUi.c index 49cdb59..532e26d 100644 --- src/hg/lib/barChartUi.c +++ src/hg/lib/barChartUi.c @@ -240,67 +240,53 @@ char *barChartUiGetCategoryLabelById(int id, char *database, struct trackDb *tdb) /* Get label for a category id */ { struct barChartCategory *categ = barChartUiGetCategoryById(id, database, tdb); if (categ == NULL) return "Unknown"; return categ->label; } void barChartCfgUi(char *database, struct cart *cart, struct trackDb *tdb, char *track, char *title, boolean boxed) /* Bar chart track type */ { -jsIncludeFile("barChart.js", NULL); // FIXME: isPopup can't be global if (cartVarExists(cart, "ajax")) isPopup = TRUE; boxed = cfgBeginBoxAndTitle(tdb, boxed, title); // KRR FIX: another candidate for table lookup ? if (startsWith("big", tdb->type)) labelCfgUi(database, cart, tdb); printf("\n<table id=barChartControls style='font-size:%d%%' %s>\n<tr><td>", isPopup ? 75 : 100, boxed ?" width='100%'":""); char cartVar[1024]; /* Data transform. When selected, the next control (view limits max) is disabled */ puts("<div>"); barChartUiLogTransform(cart, track, tdb); /* Viewing limits max. This control is disabled if log transform is selected */ // construct class so JS can toggle puts(" "); barChartUiViewLimits(cart, track, tdb); puts("</div>"); -/* Color scheme */ -#ifdef COLOR_SCHEME -printf("<p><b>Category colors:</b>\n"); -safef(cartVar, sizeof(cartVar), "%s.%s", track, BAR_CHART_COLORS); -selected = cartCgiUsualString(cart, cartVar, BAR_CHART_COLORS_DEFAULT); -boolean isUserColors = sameString(selected, BAR_CHART_COLORS_USER); -cgiMakeRadioButton(cartVar, BAR_CHART_COLORS_USER, isUserColors); -printf("Defined\n"); -cgiMakeRadioButton(cartVar, BAR_CHART_COLORS_RAINBOW, !isUserColors); -printf("Rainbow\n"); -printf("</p>"); -#endif - /* Category filter */ printf("<br>"); char *categoryLabel = trackDbSettingClosestToHomeOrDefault(tdb, BAR_CHART_CATEGORY_LABEL, BAR_CHART_CATEGORY_LABEL_DEFAULT); char *db = cartString(cart, "db"); struct barChartCategory *categs = barChartUiGetCategories(db, tdb); printf("<div><b>%s:</b>\n", categoryLabel); safef(cartVar, sizeof(cartVar), "%s.%s", track, BAR_CHART_CATEGORY_SELECT); if (isPopup) { printf("<a href='%s?g=%s'><button type='button'>Change</button><a>", hTrackUiForTrack(track), track); } else {