[Openautomation-svn] SF.net SVN: openautomation:[316] CometVisu/trunk/visu/designs/ structure_pure.js

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

Revision: 316
          http://openautomation.svn.sourceforge.net/openautomation/?rev=316&view=rev
Author:   mayerch
Date:     2011-03-08 21:13:18 +0000 (Tue, 08 Mar 2011)

Log Message:
-----------
Bug fix for the broken styling feature

Modified Paths:
--------------
    CometVisu/trunk/visu/designs/structure_pure.js

Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js	2011-03-06 20:46:46 UTC (rev 315)
+++ CometVisu/trunk/visu/designs/structure_pure.js	2011-03-08 21:13:18 UTC (rev 316)
@@ -761,25 +761,6 @@
   var element = passedElement || $(this);
   var thisTransform = element.data().address[ e.type ][0];
   var value = transformDecode( element.data().address[ e.type ][0], data );
-  if( element.data( 'precision' ) )
-    value = Number( value ).toPrecision( element.data( 'precision' ) );
-  if( element.data( 'format' ) )
-    value = sprintf( element.data( 'format' ), value );
-  element.data( 'value', value );
-  value = map( value, element );
-  if( value.constructor == Date )
-  {
-    switch( thisTransform ) // special case for KNX
-    {
-      case 'DPT:10.001':
-        value = value.toLocaleTimeString();
-        break;
-      case 'DPT:11.001':
-        value = value.toLocaleDateString();
-        break;
-    }
-  }
-  element.find('.value').text( value );
 
   var styling = element.data('styling');
   if( styling && stylings[styling] && (stylings[styling][value] || stylings[styling]['range']) )
@@ -803,5 +784,26 @@
       if( not_found ) element.addClass( 'actor' );
     }
   }
+
+  if( element.data( 'precision' ) )
+    value = Number( value ).toPrecision( element.data( 'precision' ) );
+  if( element.data( 'format' ) )
+    value = sprintf( element.data( 'format' ), value );
+  element.data( 'value', value );
+  value = map( value, element );
+  if( value.constructor == Date )
+  {
+    switch( thisTransform ) // special case for KNX
+      {
+      case 'DPT:10.001':
+        value = value.toLocaleTimeString();
+        break;
+      case 'DPT:11.001':
+        value = value.toLocaleDateString();
+        break;
+      }
+  }
+  element.find('.value').text( value );
+  
   return 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.