Commit 854adcec682191bebc87ac4184ace61b5ed07d26

Authored by Nikita Kulshreshtha
2 parents 32ac8e2b 6c1b8cdf

Merge branch 'linkmcustomscroll' into Develop

400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... ... @@ -534,9 +534,18 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
534 534  
535 535 //jspanel functionality..
536 536  
537   - $rootScope.getSelectedModuleId = function (selectedModuleId) {
  537 + $rootScope.getModuleScrollPosition = function () {
  538 + $('.mCSB_container ul li').click(function () {
  539 +
  540 + $rootScope.scrollTopPosition = $(this).position().top;
  541 +
  542 + });
538 543 setTimeout(function () {
539   - $(".sidebar").mCustomScrollbar("scrollTo", $("#" + selectedModuleId));
  544 +
  545 + $(".sidebar").mCustomScrollbar("scrollTo", $rootScope.scrollTopPosition + "px");
  546 +
  547 +
  548 +
540 549 }, 300);
541 550 }
542 551  
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
... ... @@ -26,7 +26,7 @@
26 26 <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide ">
27 27 <!--{{name}}-->
28 28 <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
29   - <li ng-repeat="module in userModules"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getSelectedModuleId(module.slug)" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')"><!--{{module.name}}--></a></li>
  29 + <li ng-repeat="module in userModules"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')"><!--{{module.name}}--></a></li>
30 30 </ul>
31 31 </div>
32 32  
... ...