6e2f467db51f5b7c6827a5e8189d1e0ecb4c8a7f larrym Wed Oct 19 12:30:33 2011 -0700 remove use of advancedJavascriptFeaturesEnabled config (see redmine #5283) diff --git src/hg/lib/jsHelper.c src/hg/lib/jsHelper.c index d010079..7d2ebe3 100644 --- src/hg/lib/jsHelper.c +++ src/hg/lib/jsHelper.c @@ -410,64 +410,30 @@ { char *regExs[] = {"<script\\s*>[^<]*</script\\s*>", "<script[^>]*>" // handles case where they have an un-closed script tag with a src attribute }; int i; str = cloneString(str); for(i=0;i<ArraySize(regExs);i++) { char *tmp = str; str = stripRegEx(str, regExs[i], REG_ICASE); freeMem(tmp); } return str; } -boolean advancedJavascriptFeaturesEnabled(struct cart *cart) -// Returns TRUE if advanced javascript features are currently enabled -{ -static boolean alreadyLookedForadvancedJs = FALSE; -static boolean advancedJsEnabled = FALSE; -if(!alreadyLookedForadvancedJs) - { - char *ua = cgiUserAgent(); - boolean defaultVal = TRUE; - - // dragZooming was broken in version 530.4 of AppleWebKit browsers (used by Safari, Chrome and some other browsers). - // This was explicitly fixed by the WebKit team in version 531.0.1 (see http://trac.webkit.org/changeset/45143). - // The AppleWebKit version provided by the browser in user agent doesn't always include the minor version number, so to - // be overly conservative we default drag-and-drop to off when AppleWebKit major version == 530 - - if(ua != NULL) - { - char *needle = "AppleWebKit/"; - char *ptr = strstr(ua, needle); - if(ptr != NULL) - { - int version = 0; - sscanf(ptr + strlen(needle), "%d", &version); - defaultVal = (version != 530); - } - } - advancedJsEnabled = cartUsualBoolean(cart, "enableAdvancedJavascript", defaultVal); - alreadyLookedForadvancedJs = TRUE; - } -//else -// warn("already looked up advancedJsEnabled"); // got msg 41 times in one page! -return advancedJsEnabled; -} - void jsBeginCollapsibleSection(struct cart *cart, char *track, char *section, char *sectionTitle, boolean isOpenDefault) /* Make the hidden input, collapse/expand button and <TR id=...> needed for utils.js's * setTableRowVisibility(). Caller needs to have already created a <TABLE> and <FORM>. */ { char collapseGroupVar[512]; safef(collapseGroupVar, sizeof(collapseGroupVar), "%s.section_%s_close", track, section); boolean isOpen = !cartUsualBoolean(cart, collapseGroupVar, !isOpenDefault); // Both plus button and title are now in same <TD> // but still colspan=2 because we are lib code and callers own the table. printf("<TR><TD colspan=2 style='text-align:left;'>\n"); printf("<input type='hidden' name='%s' id='%s' value='%s'>\n", collapseGroupVar, collapseGroupVar, isOpen ? "0" : "1"); char *buttonImage = (isOpen ? "../images/remove_sm.gif" : "../images/add_sm.gif");