ADAM / AIAHTML5

Commit c680493b3508e6d71e37201f054e55ed661fe277

Authored by unknown
1 parent b7d68d86

DA > Modesty is display, when transparency is 100 and layer level is 100%

Inline Side-by-side
Showing 1 changed file with 4 additions and 12 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @c680493
... ... @@ -5485,28 +5485,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5485 5485 $('#speechBubbleTrns').remove();
5486 5486 }
5487 5487  
5488   - var t = $(".ui-wrapper").css("top");
5489   - var e = t.split("p");
5490   - var a = $(".ui-wrapper").css("height");
5491   - var b = a.split("p");
5492   - var c = parseInt(e[0]) + parseInt(b[0]);
5493   -
5494   -
5495 5488 var tCanvasTopPos = $(".ui-wrapper").css("top");
5496 5489 var tCanvasTopPosAftrSplit = tCanvasTopPos.split("p");
5497 5490 var tCanvasHeight = $(".ui-wrapper").css("height");
5498 5491 var tCanvasHeightAftrSplit = tCanvasHeight.split("p");
5499 5492 var tCanvasAttr = parseInt(tCanvasTopPosAftrSplit[0]) + parseInt(tCanvasHeightAftrSplit[0]);
5500 5493  
5501   -
5502   - if ((evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) >= parseInt(tCanvasTopPosAftrSplit[0]) && (evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) < tCanvasAttr) {
  5494 + if ((evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) >= parseInt(tCanvasTopPosAftrSplit[0]) && (evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) <= tCanvasAttr) {
5503 5495  
5504 5496 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
5505 5497  
5506 5498 }
5507 5499 else {
5508 5500  
5509   - $rootScope.getAnnotationTextBasedOnSelectedBodyRegion(event);
  5501 + $rootScope.getAnnotationTextBasedOnSelectedBodyRegion(evt);
5510 5502  
5511 5503 }
5512 5504  
... ... @@ -5554,7 +5546,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5554 5546 $scope.annotationTextArrayT2 = [];
5555 5547 $scope.annotationTextArrayT1.push(annotations.annotationT1);
5556 5548 $scope.annotationTextArrayT2.push(annotations.annotationT2);
5557   -
  5549 +
5558 5550 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
5559 5551 }
5560 5552 else
... ... @@ -5563,7 +5555,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5563 5555 $scope.annotationTextArrayT2 = [];
5564 5556 $scope.annotationTextArrayT1.push(annotations.annotationT1);
5565 5557 $scope.annotationTextArrayT2.push(annotations.annotationT2);
5566   -
  5558 +
5567 5559 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
5568 5560 }
5569 5561 }
... ...