690fa17cbf29efbe0f1b6c9b724f4e3614a615fb galt Thu Mar 2 23:23:09 2017 -0800 fixes #18981. track search js problems from CSP2 changes. Needed to add id to some functions in cheapcgi.c and hui.c. diff --git src/hg/inc/hui.h src/hg/inc/hui.h index 1c390ad..0b1485e 100644 --- src/hg/inc/hui.h +++ src/hg/inc/hui.h @@ -198,45 +198,45 @@ * equivalent enum. */ char *hStringFromTv(enum trackVisibility vis); /* Given enum representation convert to string. */ /* Standard width for visibility dropdowns */ #define TV_DROPDOWN_STYLE "width: 70px" void hTvDropDownClassVisOnlyAndExtra(char *varName, enum trackVisibility vis, boolean canPack, char *class, char *visOnly, struct slPair *events); /* Make track visibility drop down for varName with style class, and potentially limited to visOnly */ #define hTvDropDownClassVisOnly(varName,vis,canPack,class,visOnly) \ hTvDropDownClassVisOnlyAndExtra(varName,vis,canPack,class,visOnly,NULL) -void hTvDropDownClassWithJavascript(char *varName, enum trackVisibility vis, boolean canPack, +void hTvDropDownClassWithJavascript(char *varName, char *id, enum trackVisibility vis, boolean canPack, char *class, struct slPair *events); /* Make track visibility drop down for varName with style class and javascript */ #define hTvDropDownClass(varName,vis,canPack,class) \ - hTvDropDownClassWithJavascript((varName),(vis),(canPack),(class),NULL) + hTvDropDownClassWithJavascript((varName),NULL,(vis),(canPack),(class),NULL) #define hTvDropDownWithJavascript(varName,vis,canPack,javascript) \ - hTvDropDownClassWithJavascript((varName),(vis),(canPack),"normalText",(javascript)) + hTvDropDownClassWithJavascript((varName),NULL,(vis),(canPack),"normalText",(javascript)) #define hTvDropDown(varName,vis,canPack) \ - hTvDropDownClassWithJavascript((varName),(vis),(canPack),"normalText",NULL) + hTvDropDownClassWithJavascript((varName),NULL,(vis),(canPack),"normalText",NULL) #define SUPERTRACK_DEFAULT_VIS "hide" -void hideShowDropDownWithClassAndExtra(char *varName, boolean show, char *class, struct slPair *events); +void hideShowDropDownWithClassAndExtra(char *varName, char *id, boolean show, char *class, struct slPair *events); #define hideShowDropDown(varName,show,class) \ - hideShowDropDownWithClassAndExtra(varName,show,class,NULL) + hideShowDropDownWithClassAndExtra(varName,NULL,show,class,NULL) /* Make hide/show dropdown for varName */ /****** Some stuff for stsMap related controls *******/ enum stsMapOptEnum { smoeGenetic = 0, smoeGenethon = 1, smoeMarshfield = 2, smoeDecode = 3, smoeGm99 = 4, smoeWiYac = 5, smoeWiRh = 6, smoeTng = 7, }; enum stsMapOptEnum smoeStringToEnum(char *string);