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

[<j-...@us...>]

Revision: 672
          http://openautomation.svn.sourceforge.net/openautomation/?rev=672&view=rev
Author:   j-n-k
Date:     2012-01-31 09:44:42 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Added function for address-parsing (makeAddressList($(page)))

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

Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js	2012-01-30 20:29:19 UTC (rev 671)
+++ CometVisu/trunk/visu/designs/structure_pure.js	2012-01-31 09:44:42 UTC (rev 672)
@@ -48,8 +48,25 @@
   }
   return this;
 }
- 
+
 /**
+  * this function extracts all addresses with attributes (JNK)
+  */
+  
+function makeAddressList(page) {
+  var address = {};
+  page.find('address').each( function(){ 
+    var src = this.textContent;
+    var transform = this.getAttribute('transform');
+    var readonly  = this.getAttribute('readonly');
+    var writeonly = this.getAttribute('writeonly');
+    ga_list.push( src ) 
+    address[ '_' + src ] = [ transform, readonly=='true', writeonly=='true' ];
+  });
+  return address;
+}
+
+/**
  * This class defines all the building blocks for a Visu in the "Pure" design
  */
    
@@ -253,12 +270,12 @@
       var style = layout ? 'style="' + extractLayout( layout ) + '"' : '';
       var ret_val = $('<div class="widget clearfix info" ' + style + ' />');
       ret_val.setWidgetStyle($p).makeWidgetLabel($p);
-      var address = {};
-      $p.find('address').each( function(){ 
+      var address = makeAddressList($p);
+      /*$p.find('address').each( function(){ 
         var src = this.textContent;
         ga_list.push( src ) 
         address[ '_' + src ] = [ this.getAttribute('transform') ];
-      });
+      }); */
       var actor = '<div class="actor"><div class="value">-</div></div>';
       var $actor = $(actor).data({
         'address'  : address,
@@ -409,15 +426,7 @@
       ret_val.setWidgetStyle($p)
       var labelElement = $p.find('label')[0];
       var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
-      var address = {};
-      $p.find('address').each( function(){ 
-        var src = this.textContent;
-        var transform = this.getAttribute('transform');
-        var readonly  = this.getAttribute('readonly');
-        var writeonly = this.getAttribute('writeonly');
-        ga_list.push( src ) 
-        address[ '_' + src ] = [ transform, readonly=='true', writeonly=='true' ];
-      });
+      var address = makeAddressList($p);
       var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
       var $actor = $(actor).data( {
         'address' : address,
@@ -474,14 +483,7 @@
       ret_val.setWidgetStyle($p);
       var labelElement = $p.find('label')[0];
       var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
-      var address = {};
-      $p.find('address').each( function(){ 
-        var src = this.textContent;
-        var transform = this.getAttribute('transform');
-        var readonly  = this.getAttribute('readonly');
-        ga_list.push( src ) 
-        address[ '_' + src ] = [ transform, readonly=='true' ];
-      });
+      var address = makeAddressList($p);
       var actor = '<div class="actor switchUnpressed"><div class="value">-</div></div>';
       var $actor = $(actor).data( {
         'address' : address,
@@ -541,15 +543,8 @@
       ret_val.setWidgetStyle($p)
       var labelElement = $p.find('label')[0];
       var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
-      var address = {};
+      var address = makeAddressList($p);
       var showstatus = $p.attr("showstatus") || "false";
-      $p.find('address').each( function(){ 
-        var src = this.textContent;
-        var transform = this.getAttribute('transform');
-        var readonly  = this.getAttribute('readonly');
-        ga_list.push( src ) 
-        address[ '_' + src ] = [ transform, readonly=='true' ];
-      });
       ret_val.append( label );
       var buttons = $('<div style="float:left"/>');
       var buttonCount = 0;
@@ -692,14 +687,7 @@
       ret_val.setWidgetStyle($p);
       var labelElement = $p.find('label')[0];
       var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
-      var address = {};
-      $p.find('address').each( function(){ 
-        var src = this.textContent;
-        var transform = this.getAttribute('transform');
-        var readonly  = this.getAttribute('readonly');
-        ga_list.push( src ) 
-        address[ '_' + src ] = [ transform, readonly=='true' ];
-      });
+      var address = makeAddressList($p);
       var actor = '<div class="actor switchUnpressed ';
       if ( $p.attr( 'align' ) ) 
         actor += $p.attr( 'align' ); 

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