Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[1345] CometVisu/trunk/visu
|
From: <pe...@us...> - 2013-01-19 13:53:24
|
Revision: 1345
http://openautomation.svn.sourceforge.net/openautomation/?rev=1345&view=rev
Author: peuter
Date: 2013-01-19 13:53:17 +0000 (Sat, 19 Jan 2013)
Log Message:
-----------
some more fixes for templateengine-method calls
Modified Paths:
--------------
CometVisu/trunk/visu/plugins/clock/structure_plugin.js
CometVisu/trunk/visu/structure/pure/imagetrigger.js
CometVisu/trunk/visu/structure/pure/infotrigger.js
CometVisu/trunk/visu/structure/pure/multitrigger.js
CometVisu/trunk/visu/structure/pure/page.js
CometVisu/trunk/visu/structure/pure/slide.js
CometVisu/trunk/visu/structure/pure/switch.js
CometVisu/trunk/visu/structure/pure/toggle.js
CometVisu/trunk/visu/structure/pure/trigger.js
Modified: CometVisu/trunk/visu/plugins/clock/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/clock/structure_plugin.js 2013-01-19 13:22:55 UTC (rev 1344)
+++ CometVisu/trunk/visu/plugins/clock/structure_plugin.js 2013-01-19 13:53:17 UTC (rev 1345)
@@ -121,7 +121,7 @@
for( var addr in data.address )
{
if( data.address[addr][1] == true ) continue; // skip read only
- visu.write( addr.substr(1), transformEncode( data.address[addr][0], data.value ) );
+ templateEngine.visu.write( addr.substr(1), templateEngine.transformEncode( data.address[addr][0], data.value ) );
}
}
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/imagetrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/imagetrigger.js 2013-01-19 13:22:55 UTC (rev 1344)
+++ CometVisu/trunk/visu/structure/pure/imagetrigger.js 2013-01-19 13:53:17 UTC (rev 1345)
@@ -84,7 +84,7 @@
continue; // skip when write flag not set
if( data.sendValue == "" )
continue; // skip empty
- templateEngine.visu.write( addr.substr(1), transformEncode( data.address[addr][0], sendValue ) );
+ templateEngine.visu.write( addr.substr(1), templateEngine.transformEncode( data.address[addr][0], sendValue ) );
}
}
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/infotrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/infotrigger.js 2013-01-19 13:22:55 UTC (rev 1344)
+++ CometVisu/trunk/visu/structure/pure/infotrigger.js 2013-01-19 13:53:17 UTC (rev 1345)
@@ -138,7 +138,7 @@
{
if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
if( data.address[addr][2] != relative ) continue; // skip when address mode doesn't fit action mode
- templateEngine.visu.write( addr.substr(1), transformEncode( data.address[addr][0], value ) );
+ templateEngine.visu.write( addr.substr(1), templateEngine.transformEncode( data.address[addr][0], value ) );
}
}
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/multitrigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/multitrigger.js 2013-01-19 13:22:55 UTC (rev 1344)
+++ CometVisu/trunk/visu/structure/pure/multitrigger.js 2013-01-19 13:53:17 UTC (rev 1345)
@@ -134,7 +134,7 @@
for( var addr in data.address )
{
if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
- templateEngine.visu.write( addr.substr(1), transformEncode( data.address[addr][0], data.value ) );
+ templateEngine.visu.write( addr.substr(1), templateEngine.transformEncode( data.address[addr][0], data.value ) );
}
}
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/page.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/page.js 2013-01-19 13:22:55 UTC (rev 1344)
+++ CometVisu/trunk/visu/structure/pure/page.js 2013-01-19 13:53:17 UTC (rev 1345)
@@ -142,7 +142,7 @@
default:
if (data==01) {
templateEngine.scrollToPage(this.attributes.path.nodeValue);
- templateEngine.visu.write(e.type.substr(1), transformEncode('DPT:1.001', 0));
+ templateEngine.visu.write(e.type.substr(1), templateEngine.transformEncode('DPT:1.001', 0));
}
}
}
Modified: CometVisu/trunk/visu/structure/pure/slide.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/slide.js 2013-01-19 13:22:55 UTC (rev 1344)
+++ CometVisu/trunk/visu/structure/pure/slide.js 2013-01-19 13:53:17 UTC (rev 1345)
@@ -115,8 +115,8 @@
for( var addr in data.address )
{
if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
- var dv = transformEncode( data.address[addr][0], asv );
- if( dv != transformEncode( data.address[addr][0], data.value ) )
+ var dv = templateEngine.transformEncode( data.address[addr][0], asv );
+ if( dv != templateEngine.transformEncode( data.address[addr][0], data.value ) )
templateEngine.visu.write( addr.substr(1), dv );
}
data.value = actor.slider('value');
@@ -133,8 +133,8 @@
for( var addr in data.address )
{
if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
- var uv = transformEncode( data.address[addr][0], ui.value );
- if( uv != transformEncode( data.address[addr][0], data.value ) )
+ var uv = templateEngine.transformEncode( data.address[addr][0], ui.value );
+ if( uv != templateEngine.transformEncode( data.address[addr][0], data.value ) )
templateEngine.visu.write( addr.substr(1), uv );
}
}
Modified: CometVisu/trunk/visu/structure/pure/switch.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/switch.js 2013-01-19 13:22:55 UTC (rev 1344)
+++ CometVisu/trunk/visu/structure/pure/switch.js 2013-01-19 13:53:17 UTC (rev 1345)
@@ -60,7 +60,7 @@
for( var addr in data.address )
{
if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
- templateEngine.visu.write( addr.substr(1), transformEncode( data.address[addr][0], data.basicvalue == data.off_value ? data.on_value : data.off_value ) );
+ templateEngine.visu.write( addr.substr(1), templateEngine.transformEncode( data.address[addr][0], data.basicvalue == data.off_value ? data.on_value : data.off_value ) );
}
}
});
\ No newline at end of file
Modified: CometVisu/trunk/visu/structure/pure/toggle.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/toggle.js 2013-01-19 13:22:55 UTC (rev 1344)
+++ CometVisu/trunk/visu/structure/pure/toggle.js 2013-01-19 13:53:17 UTC (rev 1345)
@@ -65,7 +65,7 @@
for( var addr in data.address )
{
if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
- templateEngine.visu.write( addr.substr(1), transformEncode( data.address[addr][0], sendValue ) );
+ templateEngine.visu.write( addr.substr(1), templateEngine.transformEncode( data.address[addr][0], sendValue ) );
}
}
});
Modified: CometVisu/trunk/visu/structure/pure/trigger.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/trigger.js 2013-01-19 13:22:55 UTC (rev 1344)
+++ CometVisu/trunk/visu/structure/pure/trigger.js 2013-01-19 13:53:17 UTC (rev 1345)
@@ -81,7 +81,7 @@
{
if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
if( isShort == data.address[addr][2] )
- templateEngine.visu.write( addr.substr(1), transformEncode( data.address[addr][0], isShort ? data.shortValue : data.sendValue ) );
+ templateEngine.visu.write( addr.substr(1), templateEngine.transformEncode( data.address[addr][0], isShort ? data.shortValue : data.sendValue ) );
}
}
$this.removeClass('switchPressed').addClass('switchUnpressed').removeData( 'downtime' );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
