|
From: <pe...@us...> - 2013-01-20 10:15:55
|
Revision: 1349
http://openautomation.svn.sourceforge.net/openautomation/?rev=1349&view=rev
Author: peuter
Date: 2013-01-20 10:15:48 +0000 (Sun, 20 Jan 2013)
Log Message:
-----------
more bugfixes on function calls of the refactored templateengine
Modified Paths:
--------------
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js
CometVisu/trunk/visu/plugins/svg/structure_plugin.js
CometVisu/trunk/visu/structure/pure/imagetrigger.js
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2013-01-20 10:05:44 UTC (rev 1348)
+++ CometVisu/trunk/visu/lib/templateengine.js 2013-01-20 10:15:48 UTC (rev 1349)
@@ -86,7 +86,7 @@
this.clientDesign = "";
- if (typeof forceReload == "undefined") {
+ if (typeof this.forceReload == "undefined") {
this.forceReload = false;
}
Modified: CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2013-01-20 10:05:44 UTC (rev 1348)
+++ CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2013-01-20 10:15:48 UTC (rev 1349)
@@ -154,7 +154,7 @@
bDiagram.data(data);
bDiagram.data("ispopup", true);
bDiagram.css({height: "90%"});
- showPopup("unknown", {title: bDiagram.data('label'), content: bDiagram});
+ templateEngine.showPopup("unknown", {title: bDiagram.data('label'), content: bDiagram});
bDiagram.parent("div").css({height: "100%", width: "90%", margin: "auto"}); // define parent as 100%!
bDiagram.empty();
var bDiagramOpts = {yaxis: {labelWidth: null}, yaxes: [{ticks: null}]};
@@ -299,7 +299,7 @@
bDiagram.css({height: "90%"});
bDiagram.data("ispopup", true);
- showPopup("unknown", {title: bDiagram.data('label'), content: bDiagram});
+ templateEngine.showPopup("unknown", {title: bDiagram.data('label'), content: bDiagram});
bDiagram.parent("div").css({height: "100%", width: "90%", margin: "auto"}); // define parent as 100%!
bDiagram.empty();
var bDiagramOpts = {yaxis: {labelWidth: null}};
Modified: CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js 2013-01-20 10:05:44 UTC (rev 1348)
+++ CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js 2013-01-20 10:15:48 UTC (rev 1349)
@@ -59,7 +59,7 @@
var data = jQuery.extend({}, rss.data());
ret_val.bind("click", function() {
- showPopup("rsslog", {title: $('.label', ret_val).text() || '', content: brss});
+ templateEngine.showPopup("rsslog", {title: $('.label', ret_val).text() || '', content: brss});
brss.parent("div").css({height: "90%", width: "90%", margin: "auto"}); // define parent as 100%!
brss.data(data);
brss.data("refresh", "");
Modified: CometVisu/trunk/visu/plugins/svg/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/svg/structure_plugin.js 2013-01-20 10:05:44 UTC (rev 1348)
+++ CometVisu/trunk/visu/plugins/svg/structure_plugin.js 2013-01-20 10:15:48 UTC (rev 1349)
@@ -49,7 +49,7 @@
$actor.data( {
'address': address,
'refresh': refresh
- } ).each(setupRefreshAction); // abuse "each" to call in context...
+ } ).each(templateEngine.setupRefreshAction); // abuse "each" to call in context...
for( var addr in address ) {
$actor.bind( addr, this.update );
}
Modified: CometVisu/trunk/visu/structure/pure/imagetrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/imagetrigger.js 2013-01-20 10:05:44 UTC (rev 1348)
+++ CometVisu/trunk/visu/structure/pure/imagetrigger.js 2013-01-20 10:15:48 UTC (rev 1349)
@@ -47,7 +47,7 @@
'mapping': map,
'sendValue': $e.attr('sendValue') || ""
} )
- .each(setupRefreshAction) // abuse "each" to call in context... refresh is broken with select right now
+ .each(templateEngine.setupRefreshAction) // abuse "each" to call in context... refresh is broken with select right now
.bind( 'click', this.action );
for( var addr in address ) {
$actor.bind( addr, this.update );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|