← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11634: Jqueryfication of main.js

 

------------------------------------------------------------
revno: 11634
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-08-12 13:35:50 +0200
message:
  Jqueryfication of main.js
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2013-07-01 19:06:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2013-08-12 11:35:50 +0000
@@ -148,24 +148,24 @@
     {
         setMenuVisible();
         $( '#mainPage' ).removeAttr( 'style' );
-        $( '#leftBar' ).show( 'fast' );
-        $( '#showLeftBar' ).hide( 'fast' );
+        $( '#leftBar' ).show( 'slide', { direction: 'left', duration: 200 } );
+        $( '#showLeftBar' ).hide();
     };
     
     this.hideAnimated = function()
     {
         setMenuHidden();
         $( '#mainPage' ).attr( 'style', 'margin-left:20px' );
-        $( '#leftBar' ).hide( 'fast' );
-        $( '#showLeftBar' ).show( 'fast' );
+        $( '#leftBar' ).hide( 'slide', { direction: 'left', duration: 200 } );
+        $( '#showLeftBar' ).delay( 200 ).fadeIn( 'fast' );
     };
     
     this.hide = function()
     {
         setMenuHidden();
         $( '#mainPage' ).attr( 'style', 'margin-left:20px' );
-        document.getElementById( 'leftBar' ).style.display = 'none';
-        document.getElementById( 'showLeftBar' ).style.display = 'block';
+        $( '#leftBar' ).hide();
+        $( '#showLeftBar' ).show();
     };
 
     function setMenuVisible()