ADAM / AIAHTML5

Commit 48024a5a8f244b406b29e5ceaac515617c9d418f

Authored by Nikita Kulshreshtha
1 parent 77497b23

Refs: #8286 

Now after extract annotations are not coming but need to see if user clicks anywhere after extarct then that part should be extarcted.
Inline Side-by-side
Showing 1 changed file with 23 additions and 1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @48024a5
... ... @@ -1380,6 +1380,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1380 1380 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1381 1381 $scope.MultiLanguageAnnationArray = [];
1382 1382 $scope.MultiLanguageAnnationArray.push(annotationText);
  1383 + if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }
  1384 + else
1383 1385 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1384 1386 }
1385 1387 else {
... ... @@ -1395,6 +1397,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1395 1397 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1396 1398 $scope.MultiLanguageAnnationArray = [];
1397 1399 $scope.MultiLanguageAnnationArray.push(annotationText);
  1400 +
  1401 + if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }
  1402 + else
1398 1403 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1399 1404 }
1400 1405 else {
... ... @@ -1402,6 +1407,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1402 1407 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1403 1408 $scope.MultiLanguageAnnationArray = [];
1404 1409 $scope.MultiLanguageAnnationArray.push(annotationText);
  1410 +
  1411 + if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }
  1412 + else
1405 1413 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1406 1414 }
1407 1415  
... ... @@ -1717,6 +1725,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1717 1725 // $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
1718 1726 $scope.MultiLanguageAnnationArray = [];
1719 1727 $scope.MultiLanguageAnnationArray.push(annotationText);
  1728 + if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }
  1729 + else
1720 1730 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1721 1731 }
1722 1732 else {
... ... @@ -1741,6 +1751,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1741 1751  
1742 1752 console.log('2. annotationText: ' + annotationText + ' , length: ' + $scope.MultiLanguageAnnationArray.length);
1743 1753  
  1754 + if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }
  1755 + else
1744 1756 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1745 1757  
1746 1758 }
... ... @@ -1752,6 +1764,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1752 1764 $scope.MultiLanguageAnnationArray.push(annotationText);
1753 1765  
1754 1766 console.log('3. annotationText: ' + annotationText + ' , length: ' + $scope.MultiLanguageAnnationArray.length);
  1767 +
  1768 + if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }
  1769 + else
1755 1770 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
1756 1771 }
1757 1772  
... ... @@ -4395,6 +4410,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4395 4410 $scope.annotationTextArrayT1.push(annotations.annotationT1);
4396 4411 $scope.annotationTextArrayT2.push(annotations.annotationT2);
4397 4412  
  4413 + if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }
  4414 + else
4398 4415 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
4399 4416 }
4400 4417 else
... ... @@ -4404,7 +4421,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4404 4421 $scope.annotationTextArrayT2 = [];
4405 4422 $scope.annotationTextArrayT1.push(annotations.annotationT1);
4406 4423 $scope.annotationTextArrayT2.push(annotations.annotationT2);
4407   -
  4424 + if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }
  4425 + else
4408 4426 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
4409 4427 }
4410 4428 tempMaskImg.src = "http://localhost/AIAHtml/" + tranparencyMaskImgSrc;
... ... @@ -4442,6 +4460,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4442 4460 $scope.annotationTextArrayT1.push(annotations.annotationT1);
4443 4461 $scope.annotationTextArrayT2.push(annotations.annotationT2);
4444 4462  
  4463 + if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }
  4464 + else
4445 4465 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
4446 4466 }
4447 4467 else
... ... @@ -4453,6 +4473,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4453 4473 $scope.annotationTextArrayT1.push(annotations.annotationT1);
4454 4474 $scope.annotationTextArrayT2.push(annotations.annotationT2);
4455 4475  
  4476 + if (($rootScope.isExtract == true) && ($rootScope.previousHighlightList.length > 0)) { }
  4477 + else
4456 4478 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
4457 4479  
4458 4480  
... ...