dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14625
committer: Mark Polak <markpo@xxxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-04-03 10:04:14 +0200
message:
  Removes menu resize on scrolling
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.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/dhis-web-commons/javascripts/dhis2/dhis2.menu.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js	2014-04-03 07:48:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js	2014-04-03 08:04:14 +0000
@@ -370,7 +370,7 @@
         $(selector).html('');
         $.tmpl( "appMenuItemTemplate", apps).appendTo(selector);
         $('#menuDropDown1 .menu-drop-down-scroll .apps-menu-more').remove();
-        $('.apps-menu-more').clone().addClass('ui-helper-clearfix').appendTo($('#menuDropDown1 .menu-drop-down-scroll'));
+        $('.apps-menu-more').clone().css('display', 'table').addClass('ui-helper-clearfix').appendTo($('#menuDropDown1 .menu-drop-down-scroll'));
     }
 
     function renderAppManager(selector) {
@@ -506,22 +506,15 @@
             var self = $(this),
                 moreAppsElement = $('#menuDropDown1 > .apps-menu-more');
 
-            if (self.parent(':animated').length !== 0)
-                return;
-
-            if (self.scrollTop() < 10 && self.innerHeight() === 220) {
+            if (self.scrollTop() < 10) {
                 moreAppsElement.show();
                 self.parent().css('width', '360px');
                 self.parent().parent().css('width', '360px');
-                self.css('height', '330px');
-                self.parent().clearQueue().animate( {'height': '330px'} );
             } else {
                 if (self.innerHeight() === 330 ) {
                     moreAppsElement.hide();
                     self.parent().css('width', '384px');
                     self.parent().parent().css('width', '384px');
-                    self.css('height', '220px');
-                    self.parent().clearQueue().animate( {'height': '220px'} );
                 }
             }