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

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

Revision: 331
          http://openautomation.svn.sourceforge.net/openautomation/?rev=331&view=rev
Author:   mayerch
Date:     2011-05-12 17:03:39 +0000 (Thu, 12 May 2011)

Log Message:
-----------
Fix bug #3300926: "Multitrigger display broken"

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-05-11 16:04:16 UTC (rev 330)
+++ CometVisu/trunk/visu/designs/structure_pure.js	2011-05-12 17:03:39 UTC (rev 331)
@@ -349,8 +349,11 @@
         address[ '_' + src ] = [ transform, readonly=='true' ];
       });
       ret_val.append( label );
+      var buttons = $('<div style="float:left"/>');
+      var buttonCount = 0;
       if( $p.attr('button1label') )
       {
+        //buttonCount++;
         var actor = '<div class="actor switchUnpressed">';
         actor += '<div class="value">' + $p.attr('button1label') + '</div>';
         actor += '</div>';
@@ -361,7 +364,8 @@
           'value'   : $p.attr('button1value'),
           'type'    : 'switch'
         } ).bind( 'click', this.action );
-        ret_val.append( $actor );
+        buttons.append( $actor );
+        if( 1 == (buttonCount++ % 2) ) buttons.append( $('<br/>') );
       }
       if( $p.attr('button2label') )
       {
@@ -375,7 +379,8 @@
           'value'   : $p.attr('button2value'),
           'type'    : 'switch'
         } ).bind( 'click', this.action );
-        ret_val.append( $actor );
+        buttons.append( $actor );
+        if( 1 == (buttonCount++ % 2) ) buttons.append( $('<br/>') );
       }
       if( $p.attr('button3label') )
       {
@@ -389,7 +394,8 @@
           'value'   : $p.attr('button3value'),
           'type'    : 'switch'
         } ).bind( 'click', this.action );
-        ret_val.append( $actor );
+        buttons.append( $actor );
+        if( 1 == buttonCount++ % 2 ) buttons.append( $('<br/>') );
       }
       if( $p.attr('button4label') )
       {
@@ -403,11 +409,12 @@
           'value'   : $p.attr('button4value'),
           'type'    : 'switch'
         } ).bind( 'click', this.action );
-        ret_val.append( $actor );
+        buttons.append( $actor );
+        if( 1 == buttonCount++ % 2 ) buttons.append( $('<br/>') );
       }
       //for( var addr in address ) $actor.bind( addr, this.update );
       //            ret_val.append( label ).append( $actor );
-      return ret_val;
+      return ret_val.append( buttons );
     },
     update: function(e,d) { 
       var element = $(this);


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