bc8a128684e7d203f7f74ee0d3579e5608751ee0
angie
  Fri Jun 7 07:06:07 2013 -0700
Revert "Added support for multi-view composites of type pgSnp.  There are no config options for pgSnp, so disable the config pop-up in configurableByAjax.  refs #683"This reverts commit 275a4e6b9d4eef6b3408e29198d94883b0e809ca.
-- Tim pointed out in code review that there is a much better way to avoid the warnBox at the end of cfgTypeFromTdb.  refs #10977 #683

diff --git src/hg/lib/trackDbCustom.c src/hg/lib/trackDbCustom.c
index f8bb9ed..b69159a 100644
--- src/hg/lib/trackDbCustom.c
+++ src/hg/lib/trackDbCustom.c
@@ -681,63 +681,60 @@
 	    else if (startsWith("encodeGencodeIntron", tdb->track))
 		cType = cfgNone;
 	    }
 	}
     }
 else if(startsWith("chain",type))
     cType = cfgChain;
 else if (startsWith("bamWig", type))
     cType = cfgWig;
 else if (startsWith("bam", type))
     cType = cfgBam;
 else if (startsWith("psl", type))
     cType = cfgPsl;
 else if (sameWord("vcfTabix",type))
     cType = cfgVcf;
-else if (sameWord("pgSnp",type))
-    cType = cfgPgSnp;
 // TODO: Only these are configurable so far
 
 if (cType == cfgNone && warnIfNecessary)
     {
     if (!startsWith("bed ", type) && !startsWith("bedDetail", type) && !startsWith("bigBed", type) && !startsWith("gvf", type)
         && subgroupFind(tdb, "view", NULL))
         warn("Track type \"%s\" is not yet supported in multi-view composites for %s.",type,tdb->track);
     }
 return cType;
 }
 
 int configurableByAjax(struct trackDb *tdb, eCfgType cfgTypeIfKnown)
 // Is this track configurable by right-click popup, or in hgTrackUi subCfg?
 // returns 0 = no; <0=explicitly blocked;  >0=allowed and will be cfgType if determined
 {
 if (tdbIsMultiTrackSubtrack(tdb))
     return cfgNone; // multitrack subtracks are never allowed to be separately configured.
 int ctPopup = (int)cfgTypeIfKnown;
 if (ctPopup <= cfgNone)
     ctPopup = (int)cfgTypeFromTdb(tdb,FALSE);
 if (ctPopup <= cfgNone && !tdbIsSubtrack(tdb)) // subtracks must receive CfgType!
     ctPopup = cfgUndetermined; // cfgTypeFromTdb() does not work for every case.
 
 if (ctPopup > cfgNone)
     {
     if (regexMatch(tdb->track, "^snp[0-9]+")     // Special cases to be removed
     ||  regexMatch(tdb->track, "^cons[0-9]+way") // (matches logic in json setup in imageV2.c)
     ||  startsWith("hapmapSnps", tdb->track)
     ||  startsWith("hapmapAlleles", tdb->track)
-    ||  trackDbSettingBlocksConfiguration(tdb,TRUE)
-    ||  ctPopup == cfgPgSnp)
+    ||  trackDbSettingBlocksConfiguration(tdb,TRUE))
         ctPopup *= -1;
     }
 return ctPopup;
 }
 
 char *trackDbSetting(struct trackDb *tdb, char *name)
 /* Look for a trackDb setting from lowest level on up chain of parents. */
 {
 struct trackDb *generation;
 char *trackSetting = NULL;
 for (generation = tdb; generation != NULL; generation = generation->parent)
     {
     trackSetting = trackDbLocalSetting(generation,name);
     if (trackSetting != NULL)
         break;