Author: croberts Date: 2012-01-23 18:57:29 +0000 (Mon, 23 Jan 2012) New Revision: 5190

Modified: branches/noflash/cumin/python/cumin/grid/negotiator.strings branches/noflash/cumin/python/cumin/stat.strings branches/noflash/cumin/resources/app.js Log: Un-breaking the flash version of slotvis.

Modified: branches/noflash/cumin/python/cumin/grid/negotiator.strings =================================================================== --- branches/noflash/cumin/python/cumin/grid/negotiator.strings 2012-01-18 20:21:39 UTC (rev 5189) +++ branches/noflash/cumin/python/cumin/grid/negotiator.strings 2012-01-23 18:57:29 UTC (rev 5190) @@ -110,7 +110,7 @@ function ofc_resize(left, width, top, height, id) { var jsonVals = cumin.get_quota_sum(); - var chart = cumin.getFlashChart(id); + var chart = cumin.getChart(id); if (chart) { if (typeof chart.setpieslice != "undefined") { var obj = {'values': jsonVals};

Modified: branches/noflash/cumin/python/cumin/stat.strings =================================================================== --- branches/noflash/cumin/python/cumin/stat.strings 2012-01-18 20:21:39 UTC (rev 5189) +++ branches/noflash/cumin/python/cumin/stat.strings 2012-01-23 18:57:29 UTC (rev 5190) @@ -224,7 +224,7 @@ cumin.expireIntervalUpdate(); return false; } else { - var chart = cumin.getFlashChart(id); + var chart = cumin.getChart(id); if ((chart == null) || (typeof $(chart).getParent().getElements('a')[chart_href] == "undefined")) { if (typeof attempt == "undefined") attempt = 1; @@ -240,7 +240,7 @@ } // called by open-flash-chart.swf in response to chart.geturl() function get_chart_url(id, url, state) { - var chart = cumin.getFlashChart(id); + var chart = cumin.getChart(id); if (chart == null) return false;

@@ -331,7 +331,7 @@ cumin.setupChart('{id}', '{fullpage_href}'); } else { cumin.forceChart = function () { - var chart = cumin.getFlashChart('{id}'); + var chart = cumin.getChart('{id}'); if (chart) { chart.height = window.getSize().y * 0.96; }

Modified: branches/noflash/cumin/resources/app.js =================================================================== --- branches/noflash/cumin/resources/app.js 2012-01-18 20:21:39 UTC (rev 5189) +++ branches/noflash/cumin/resources/app.js 2012-01-23 18:57:29 UTC (rev 5190) @@ -368,11 +368,17 @@ } }

-cumin.getFlashChart = function (id) { +cumin.getChart = function (id) { var chart = $(id.replace(/./g, "_")+"_chart"); return chart; }

+/* Only needed for flash-based slotvis, can go away when that is changed */ +cumin.getFlashChart = function (id) { + var chart = $(id+"_chart"); + return chart; +} + function incrementChartSequence(chart) { var src = chart.src; var branch = wooly.session.branch(src);