ADAM / AIAHTML5

Commit 14286c9cb1185822f1f02276f7cd293eff297d49

Authored by Nikita Kulshreshtha
2 parents 884a7ec1 ebc80013

Merge branch 'ScrollIssueInLateralArm' into Develop

Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @14286c9
... ... @@ -2249,7 +2249,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2249 2249 else if ((($rootScope.viewOrientationId == '2') || ($rootScope.viewOrientationId == '3')) && ($scope.highlightedBR.length == 5)) {
2250 2250 $scope.doAligneCanvasWithTerm = true;
2251 2251 }
2252   - else if ((($rootScope.viewOrientationId == '5')) && ($scope.highlightedBR.length == 4)) {
  2252 + else if ((($rootScope.viewOrientationId == '5')) && ($scope.highlightedBR.length == 1)) {
2253 2253 $scope.doAligneCanvasWithTerm = true;
2254 2254 }
2255 2255 else if ((($rootScope.viewOrientationId == '6')) && ($scope.highlightedBR.length == 1)) {
... ... @@ -7573,12 +7573,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7573 7573  
7574 7574 $('#canvasDiv').scrollLeft(newX);
7575 7575 $('#canvasDiv').scrollTop(newY);
7576   -
  7576 + $scope.isLoading = false;
  7577 + $('#spinner').css('visibility', 'hidden');
7577 7578 }
7578 7579  
7579 7580  
7580   - $scope.isLoading = false;
7581   - $('#spinner').css('visibility', 'hidden');
  7581 +
7582 7582 }
7583 7583  
7584 7584  
... ...