[Openautomation-svn] SF.net SVN: openautomation:[932] CometVisu/trunk/visu/lib/templateengine.js

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

Revision: 932
          http://openautomation.svn.sourceforge.net/openautomation/?rev=932&view=rev
Author:   j-n-k
Date:     2012-08-10 17:11:20 +0000 (Fri, 10 Aug 2012)
Log Message:
-----------
Fixed bug 3555836 (invalid id) and 3434083 (wrong top navigation)

Modified Paths:
--------------
    CometVisu/trunk/visu/lib/templateengine.js

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2012-08-09 19:59:24 UTC (rev 931)
+++ CometVisu/trunk/visu/lib/templateengine.js	2012-08-10 17:11:20 UTC (rev 932)
@@ -344,7 +344,7 @@
   // and now setup the pages
   var page = $( 'pages > page', xml )[0]; // only one page element allowed...
 
-  create_pages(page, '0');
+  create_pages(page, 'id_0');
 
   // all containers
   if (!/(android|blackberry|iphone|ipod|series60|symbian|windows ce|palm)/i.test(navigator.userAgent.toLowerCase())) {
@@ -371,9 +371,9 @@
   main_scroll.onSeek( updateTopNavigation );
   
   if ($.getUrlVar('startpage')) {
-    scrollToPage( $.getUrlVar('startpage'), 0 );
+    scrollToPage( 'id_'+$.getUrlVar('startpage'), 0 );
   } else {
-    scrollToPage( '0', 0 ); // simple solution to show page name on top at start
+    scrollToPage( 'id_0', 0 ); // simple solution to show page name on top at start
   }
 
   $('.fast').bind('click', function(){
@@ -603,13 +603,16 @@
 
 function updateTopNavigation() {
   var path = $('#main .page').eq( this.getIndex() ).attr('id').split( '_' );
-  var id = ''; //path[0];
+  var id = 'id_'; //path[0];
   var nav = '';
-  for( var i = 0; i < path.length; i++ ) {
+  for( var i = 1; i < path.length; i++ ) { // element 0 is id_ (JNK)
     id  += path[i];
-    nav += (0==i ? '' : '<span> &#x25ba; </span>')
+    if ($('#'+id).hasClass("page")) {
+    
+    nav += ((1==i) ? '' : '<span> &#x25ba; </span>')
         +  '<a href="javascript:scrollToPage(\'' +id+ '\')">'
-        + $('#' + id + ' h1').text() + '</a>';
+        +  $('#' + id + ' h1').text() + '</a>';
+    }
     id  += '_';
   }
   $('.nav_path').html( nav );

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