ADAM / AIAHTML5

Commit af50ba662a9d6d7d88703954706c61924154ba23

Authored by Nikita Kulshreshtha
2 parents 7ee514de 15f7c07f

Merge branch 'NormalButtonScrollIssue' into Develop

Inline Side-by-side
Showing 1 changed file with 8 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @af50ba6
... ... @@ -4882,6 +4882,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4882 4882 if ($("#btnNormalMode").hasClass("btn-primary")) {
4883 4883 $("#btnNormalMode").removeClass("btn-primary");
4884 4884 }
  4885 +
4885 4886 }
4886 4887  
4887 4888 $scope.enableNormalMode = function () {
... ... @@ -4921,6 +4922,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4921 4922 //7.
4922 4923 $scope.CalculateImageCordinates($rootScope.viewOrientationId);
4923 4924  
  4925 + $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
  4926 + $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
  4927 +
4924 4928  
4925 4929 }
4926 4930  
... ... @@ -4949,8 +4953,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4949 4953  
4950 4954 $scope.enableExtract = function () {
4951 4955  
  4956 + $rootScope.CanvasDivTopPosition = $("#canvasDiv").scrollTop();
4952 4957  
4953   -
  4958 + $rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft();
4954 4959 //if listanager is visisble then close it
4955 4960  
4956 4961 // $rootScope.isListManagerSelected = false;
... ... @@ -5022,7 +5027,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5022 5027  
5023 5028 $(".com").toggle();
5024 5029 $('#dot').toggle();
5025   - $('#sppeachBubble').toggle()
  5030 + $('#sppeachBubble').toggle();
  5031 +
5026 5032 }
5027 5033  
5028 5034  
... ...