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

[<pe...@us...>]

Revision: 965
          http://openautomation.svn.sourceforge.net/openautomation/?rev=965&view=rev
Author:   peuter
Date:     2012-08-15 18:57:52 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
* removed debug code
* Fixed bug: sometimes the navbars from inactive subpages were not removed properly

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

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2012-08-15 16:01:23 UTC (rev 964)
+++ CometVisu/trunk/visu/lib/templateengine.js	2012-08-15 18:57:52 UTC (rev 965)
@@ -149,6 +149,7 @@
   var uagent = navigator.userAgent.toLowerCase();
   var widthNavbarLeft  = $( '#navbarLeft' ).css('display')!='none' ? $( '#navbarLeft' ).width() : 0;
   var widthNavbarRight = $( '#navbarRight' ).css('display')!='none' ? $( '#navbarRight' ).width() : 0;
+  
   var width = $( 'body' ).width() - widthNavbarLeft - widthNavbarRight - 1; // remove  an additional pixel for Firefox
 
   if (/(android|blackberry|iphone|ipod|series60|symbian|windows ce|palm)/i.test(uagent)) {
@@ -326,8 +327,8 @@
       case 'config': // append config file info
         var search = window.location.search.replace( /\$/g, '$$$$' );
         search = search.replace( /.*(config=[^&]*).*|.*/, '?$1' );
-		
 
+
 // text = $(text).replaceWith( /(href="[^"]*)(")/g, '$1' + search + '$2' );
 
 
@@ -910,6 +911,7 @@
     if (shownavbar[key]=="true") {
       if ($('#navbar'+value).css("display")=="none") {
         fadeNavbar(value,"in");
+        removeInactiveNavbars(page.attr('id'));
         resize=true;
       }
     }
@@ -979,7 +981,6 @@
       break;
   }
   navbar.css(initCss);
-  console.log(targetCss);
   navbar.animate(targetCss,main_scroll.getConf().time,main_scroll.getConf().easing,fn);
 }
 

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