ADAM / AIAHTML5

Commit 3592615ea9212982d3b2c8127871e5fb63af1a31

Authored by Amrita Vishnoi
1 parent 45e9436c

annotation was not showing if extract is selected

Inline Side-by-side
Showing 1 changed file with 3 additions and 8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @3592615
@@ -4433,8 +4433,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4433,8 +4433,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4433 $scope.annotationTextArrayT1.push(annotations.annotationT1); 4433 $scope.annotationTextArrayT1.push(annotations.annotationT1);
4434 $scope.annotationTextArrayT2.push(annotations.annotationT2); 4434 $scope.annotationTextArrayT2.push(annotations.annotationT2);
4435 4435
4436 - if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }  
4437 - else  
4438 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); 4436 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
4439 } 4437 }
4440 else 4438 else
@@ -4444,8 +4442,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4444,8 +4442,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4444 $scope.annotationTextArrayT2 = []; 4442 $scope.annotationTextArrayT2 = [];
4445 $scope.annotationTextArrayT1.push(annotations.annotationT1); 4443 $scope.annotationTextArrayT1.push(annotations.annotationT1);
4446 $scope.annotationTextArrayT2.push(annotations.annotationT2); 4444 $scope.annotationTextArrayT2.push(annotations.annotationT2);
4447 - if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }  
4448 - else 4445 +
4449 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); 4446 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
4450 } 4447 }
4451 tempMaskImg.src = "http://localhost/AIAHtml/" + tranparencyMaskImgSrc; 4448 tempMaskImg.src = "http://localhost/AIAHtml/" + tranparencyMaskImgSrc;
@@ -4483,8 +4480,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4483,8 +4480,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4483 $scope.annotationTextArrayT1.push(annotations.annotationT1); 4480 $scope.annotationTextArrayT1.push(annotations.annotationT1);
4484 $scope.annotationTextArrayT2.push(annotations.annotationT2); 4481 $scope.annotationTextArrayT2.push(annotations.annotationT2);
4485 4482
4486 - if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }  
4487 - else 4483 +
4488 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); 4484 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
4489 } 4485 }
4490 else 4486 else
@@ -4496,8 +4492,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4496,8 +4492,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4496 $scope.annotationTextArrayT1.push(annotations.annotationT1); 4492 $scope.annotationTextArrayT1.push(annotations.annotationT1);
4497 $scope.annotationTextArrayT2.push(annotations.annotationT2); 4493 $scope.annotationTextArrayT2.push(annotations.annotationT2);
4498 4494
4499 - if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }  
4500 - else 4495 +
4501 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); 4496 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
4502 4497
4503 4498