src/hg/hgTracks/config.c 1.85

1.85 2009/11/11 21:13:13 tdreszer
Changed 'Enable drag-zoom' to 'Disable advanced javascript features' in preparation for imageV2
Index: src/hg/hgTracks/config.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/config.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -b -B -U 4 -r1.84 -r1.85
--- src/hg/hgTracks/config.c	23 Sep 2009 18:42:17 -0000	1.84
+++ src/hg/hgTracks/config.c	11 Nov 2009 21:13:13 -0000	1.85
@@ -402,11 +402,11 @@
 hPrintf("Enable track re-ordering");
 hPrintf("</TD></TR>\n");
 
 hPrintf("<TR><TD>");
-hCheckBox("dragZooming", dragZoomingConfig(cart));
+hCheckBox("disableAdvancedJavascript", !advancedJavascriptFeaturesEnabled(cart));
 hPrintf("</TD><TD>");
-hPrintf("Enable drag-and-zoom");
+hPrintf("Disable advanced javascript features");
 hPrintf("</TD></TR>\n");
 
 
 hTableEnd();
@@ -440,13 +440,13 @@
 {
 configPageSetTrackVis(-2);
 }
 
-boolean dragZoomingConfig(struct cart *cart)
-// Returns TRUE if drag-and-zoom is currently on
+boolean advancedJavascriptFeaturesEnabled(struct cart *cart)
+// Returns TRUE if advanced javascript features are currently enabled
 {
 char *ua = cgiUserAgent();
-boolean defaultVal = TRUE;
+boolean defaultVal = FALSE;
 
 // 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
@@ -459,9 +459,9 @@
     if(ptr != NULL)
         {
         int version = 0;
         sscanf(ptr + strlen(needle), "%d", &version);
-        defaultVal = version != 530;
+        defaultVal = (version == 530);
         }
     }
-return cartUsualBoolean(cart, "dragZooming", defaultVal);
+return (cartUsualBoolean(cart, "disableAdvancedJavascript", defaultVal) == FALSE); // Sorry about the double negative!
 }