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

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

Revision: 756
          http://openautomation.svn.sourceforge.net/openautomation/?rev=756&view=rev
Author:   mayerch
Date:     2012-04-15 13:16:14 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
- Fix bug that prevented page switch by GA
- Added page switch by GA to the demo config

Modified Paths:
--------------
    CometVisu/trunk/visu/structure/pure/page.js
    CometVisu/trunk/visu/visu_config_demo.xml

Modified: CometVisu/trunk/visu/structure/pure/page.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/page.js	2012-04-15 08:39:43 UTC (rev 755)
+++ CometVisu/trunk/visu/structure/pure/page.js	2012-04-15 13:16:14 UTC (rev 756)
@@ -89,8 +89,8 @@
         address[ '_' + $p.attr('floor') ] = [ 'DPT:5.004', 0, 'floor' ];
         container.bind( '_' + $p.attr('floor'), this.update );
       }; 
-      container.data( 'address', address );
     }
+    container.data( 'address', address );
     $( childs ).each( function(i){
         container.append( create_pages( childs[i], path + '_' + i, flavour, type ) );
     } );

Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml	2012-04-15 08:39:43 UTC (rev 755)
+++ CometVisu/trunk/visu/visu_config_demo.xml	2012-04-15 13:16:14 UTC (rev 756)
@@ -209,6 +209,10 @@
         <label>Polikarpov I-15bis - Ogg Theora</label>
       </video>
     </page>
+    <trigger value="1">
+      <label>Seitenwechsel per GA</label>
+      <address transform="DPT:1.001" readonly="false" type="">12/7/100</address>
+    </trigger>
     <line/>
     <page name="iframe Test" align="center" >
       <iframe src="http://www.cometvisu.org" width="500px" height="500px"/>
@@ -236,7 +240,7 @@
       <page name="Flavour: Boron" align="center" flavour="boron">
         <text align="center">CometVisu Boron flavour</text>
         <line/>
-        <page name="Subpage">
+        <page name="Subpage" ga="12/7/100">
           <text>An empty page</text>
           <line/>
         </page>

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