Author: tmckay
Date: 2011-01-26 21:55:25 +0000 (Wed, 26 Jan 2011)
New Revision: 4490
Modified:
branches/1.3.2/cumin/python/cumin/stat.strings
branches/1.3.2/cumin/resources/app.js
Log:
Merged revision 4489 from trunk. Original comment is:
fix for bz 672604 - Removed the attempt to restore the charts to the current duration
after a page refresh. Now, after the user refreshes the page, the charts will revert to
their original default duration.
Modified: branches/1.3.2/cumin/python/cumin/stat.strings
===================================================================
--- branches/1.3.2/cumin/python/cumin/stat.strings 2011-01-26 21:31:25 UTC (rev 4489)
+++ branches/1.3.2/cumin/python/cumin/stat.strings 2011-01-26 21:55:25 UTC (rev 4490)
@@ -312,7 +312,7 @@
cumin.setupChart('{id}', {width});
} else {
swfobject.embedSWF("resource?name=open-flash-chart.swf",
"{id}_chart", "{width}", "{height}", "9.0.0",
"",
- {"data-file":"{href}"}, {wmode: "opaque"},
null, cumin.processHash);
+ {"data-file":"{href}", "id":"{id}"},
{wmode: "opaque"});
wooly.addPageUpdateListener(function () { cumin.updateFlashChart('{id}');
});
window.addEvent('domready',function () {
Modified: branches/1.3.2/cumin/resources/app.js
===================================================================
--- branches/1.3.2/cumin/resources/app.js 2011-01-26 21:31:25 UTC (rev 4489)
+++ branches/1.3.2/cumin/resources/app.js 2011-01-26 21:55:25 UTC (rev 4490)
@@ -416,15 +416,11 @@
wooly.log("reload not definded for " + id);
}
-/* called after page with a flash chart loads
- called once for each chart on the page
- used to parse the url hash and restore the chart's
- duration to what was requested
-*/
-cumin.processHash = function (e) {
- if (e.success) {
+/*
+function ofc_ready(id) {
+ if (typeof id != "undefined") {
+ var key = id;
var hash = wooly.session.hash();
- var key = e.id.replace("_chart", "");
if (typeof hash[key] != "undefined") {
var oChartHtml = $(key);
if (oChartHtml) {
@@ -462,6 +458,7 @@
}
}
});
+*/
function ofc_range(id, href, low, high) {
var chart = cumin.getFlashChart(id);
Show replies by date