Merge branch 'NormalButtonScrollIssue' into Develop

Nikita Kulshreshtha
2 parents 7ee514de 15f7c07f
Showing 1 changed file with 8 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -4882,6 +4882,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         if ($("#btnNormalMode").hasClass("btn-primary")) {
             $("#btnNormalMode").removeClass("btn-primary");
         }
+
     }
     $scope.enableNormalMode = function () {
@@ -4921,6 +4922,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             //7.
             $scope.CalculateImageCordinates($rootScope.viewOrientationId);
+            $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
+            $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
+          
         }
@@ -4949,8 +4953,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.enableExtract = function () {
+        $rootScope.CanvasDivTopPosition = $("#canvasDiv").scrollTop();
-
+        $rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft();
         //if listanager is visisble then close it
         // $rootScope.isListManagerSelected = false;
@@ -5022,7 +5027,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $(".com").toggle();
         $('#dot').toggle();
-        $('#sppeachBubble').toggle()
+        $('#sppeachBubble').toggle();
+
     }