[Openautomation-svn] SF.net SVN: openautomation:[1303] CometVisu/trunk/visu

[<ma...@us...>]

Revision: 1303
          http://openautomation.svn.sourceforge.net/openautomation/?rev=1303&view=rev
Author:   mayerch
Date:     2013-01-05 00:00:48 +0000 (Sat, 05 Jan 2013)
Log Message:
-----------
Second iteration to bring varaible uptade in the right order - fix had to be deeper than thought :(

Modified Paths:
--------------
    CometVisu/trunk/visu/lib/templateengine.js
    CometVisu/trunk/visu/structure/pure/_common.js
    CometVisu/trunk/visu/structure/pure/switch.js

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2013-01-04 20:41:37 UTC (rev 1302)
+++ CometVisu/trunk/visu/lib/templateengine.js	2013-01-05 00:00:48 UTC (rev 1303)
@@ -422,15 +422,18 @@
           $this.find('entry').each(
               function() {
                 var $localThis = $(this);
-                var value = $localThis.contents();
-                for ( var i = 0; i < value.length; i++) {
-                  var $v = $(value[i]);
+                var origin = $localThis.contents();
+                var value = [];
+                for ( var i = 0; i < origin.length; i++) {
+                  var $v = $(origin[i]);
                   if ($v.is('icon'))
                     value[i] = icons.getIcon($v.attr('name'), $v.attr('type'), $v.attr('flavour'), $v.attr('color'));
+                  else
+                    value[i] = $v.text();
                 }
 
                 if ($localThis.attr('value')) {
-                  mappings[name][$localThis.attr('value')] = value;
+                  mappings[name][$localThis.attr('value')] = value.length == 1 ? value[0] : value;
                 } else {
                   if (!mappings[name]['range'])
                     mappings[name]['range'] = {};

Modified: CometVisu/trunk/visu/structure/pure/_common.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/_common.js	2013-01-04 20:41:37 UTC (rev 1302)
+++ CometVisu/trunk/visu/structure/pure/_common.js	2013-01-05 00:00:48 UTC (rev 1303)
@@ -360,12 +360,16 @@
   var valueElement = element.find('.value');
   valueElement.empty();
   if( ('string' == typeof value) || ('number' == typeof value) )
-  {
     valueElement.append( value );
-  } else 
-  for( var i = 0; i < value.length; i++ )
+  else
   {
-    valueElement.append( $(value[i]).clone() );
+    for( var i = 0; i < value.length; i++ )
+    {
+      if( ('string' == typeof value[i]) || ('number' == typeof value[i]) )
+        valueElement.append( value[i] );
+      else
+        valueElement.append( $(value[i]).clone() );
+    }
   }
   
   return value;

Modified: CometVisu/trunk/visu/structure/pure/switch.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/switch.js	2013-01-04 20:41:37 UTC (rev 1302)
+++ CometVisu/trunk/visu/structure/pure/switch.js	2013-01-05 00:00:48 UTC (rev 1303)
@@ -60,7 +60,7 @@
     for( var addr in data.address )
     {
       if( !(data.address[addr][1] & 2) ) continue; // skip when write flag not set
-      visu.write( addr.substr(1), transformEncode( data.address[addr][0], data.value == data.off_value ? data.on_value : data.off_value ) );
+      visu.write( addr.substr(1), transformEncode( data.address[addr][0], data.basicvalue == data.off_value ? data.on_value : data.off_value ) );
     }
   }
 });
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.