Author: eallen Date: 2010-08-27 14:24:21 -0400 (Fri, 27 Aug 2010) New Revision: 4241 Modified: mgmt/newdata/cumin/python/cumin/grid/pool.py mgmt/newdata/cumin/python/cumin/grid/pool.strings mgmt/newdata/cumin/resources/slots.swf Log: Further fixes for BZ 623677 - Allow lists that are too tall to overflow the flash area - Allow scrolling in the flash vis by mouse dragging - Reset the scroll position back to top when loading a new set of slots Modified: mgmt/newdata/cumin/python/cumin/grid/pool.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/pool.py 2010-08-27 16:36:59 UTC (rev 4240) +++ mgmt/newdata/cumin/python/cumin/grid/pool.py 2010-08-27 18:24:21 UTC (rev 4241) @@ -301,27 +301,12 @@ return sess.marshal() - def render_ctrl_href(self, session): - collector = self.collector.get(session) - - page = self.app.grid.pool_slots_page - sess = Session(page) - - page.collector.set(sess, collector) - page.json.set(sess, "ctrl") - page.groups.set(sess, [self.group_by.get(session)]) - - return sess.marshal() - def render_slot_chart_width(self, session): return self.render_slot_clip_size(session) def render_slot_chart_height(self, session): return self.render_slot_clip_size(session) - def render_slot_ctrl_height(self, session): - return 80 - def render_fullpageable(self, session): return self.fullpageable and "fullpageable" or "" Modified: mgmt/newdata/cumin/python/cumin/grid/pool.strings =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/pool.strings 2010-08-27 16:36:59 UTC (rev 4240) +++ mgmt/newdata/cumin/python/cumin/grid/pool.strings 2010-08-27 18:24:21 UTC (rev 4241) @@ -52,16 +52,15 @@ //<![CDATA[ function updatePoolSlotVis(id, loadType) { var chart = cumin.getFlashChart(id); + if (typeof loadType == "undefined") + loadType = "load"; if ((chart != null) && (typeof chart.src != "undefined")) { - if (typeof loadType != "undefined") { - if (typeof chart.reload != "undefined") - chart.reload(chart.src, false); - } else { - if (typeof chart.load != "undefined") - chart.load(chart.src, false); - else - wooly.log("load not defined for " + id); - } + if ((loadType == "reload") && (typeof chart.reload != "undefined")) + chart.reload(chart.src, false); + else if ((loadType == "load") && (typeof chart.load != "undefined")) + chart.load(chart.src, false); + else + wooly.log("load not defined for " + id); } } function vis_loaded(data) { @@ -73,11 +72,7 @@ if (vis == "slots") { var chart = cumin.getFlashChart("{id}"); chart.src = "{slots_href}"; - updatePoolSlotVis('{id}'); - } else { - var chart = cumin.getFlashChart("{id}ctrl"); - chart.src = "{ctrl_href}"; - updatePoolSlotVis('{id}ctrl'); + updatePoolSlotVis('{id}', "load"); } } function vis_expand(parent) { @@ -89,7 +84,7 @@ var branch = wooly.session.branch(src); branch['expanded'] = parent; chart.src = branch.marshal(); - updatePoolSlotVis("{id}", "reload"); + updatePoolSlotVis("{id}", "load"); } function vis_back() { var chart = cumin.getFlashChart("{id}"); @@ -98,7 +93,7 @@ if (typeof branch.expanded != "undefined") delete branch.expanded; chart.src = branch.marshal(); - updatePoolSlotVis("{id}", "reload"); + updatePoolSlotVis("{id}", "load"); } function vis_treemap_over(type, value) { var chart = cumin.getFlashChart("{id}"); @@ -132,7 +127,7 @@ var src = branch.marshal(); var chart = cumin.getFlashChart(id); chart.src = src - updatePoolSlotVis(id, "reload"); + updatePoolSlotVis(id, "load"); return false; } @@ -151,10 +146,8 @@ } swfobject.embedSWF("resource?name=slots.swf", "{id}_chart", "{slot_chart_width}", "{slot_chart_height}", "9.0.0", "", {vis:"slots"}, params); - swfobject.embedSWF("resource?name=slots.swf", "{id}ctrl_chart", "{slot_chart_width}", "{slot_ctrl_height}", "9.0.0", "", {vis:"ctrl"}, params); wooly.addPageUpdateListener(function () { updatePoolSlotVis('{id}', "reload"); }); - wooly.addPageUpdateListener(function () { updatePoolSlotVis('{id}ctrl', "reload"); }); window.addEvent('domready',function () { cumin.setFullpageHandler('{id}', '{fullpage_href}'); }); Modified: mgmt/newdata/cumin/resources/slots.swf =================================================================== (Binary files differ)