From c680493b3508e6d71e37201f054e55ed661fe277 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 28 Mar 2017 11:29:46 +0530 Subject: [PATCH] DA > Modesty is display, when transparency is 100 and layer level is 100% --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index f025048..5a13c38 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -5485,28 +5485,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#speechBubbleTrns').remove(); } - var t = $(".ui-wrapper").css("top"); - var e = t.split("p"); - var a = $(".ui-wrapper").css("height"); - var b = a.split("p"); - var c = parseInt(e[0]) + parseInt(b[0]); - - var tCanvasTopPos = $(".ui-wrapper").css("top"); var tCanvasTopPosAftrSplit = tCanvasTopPos.split("p"); var tCanvasHeight = $(".ui-wrapper").css("height"); var tCanvasHeightAftrSplit = tCanvasHeight.split("p"); var tCanvasAttr = parseInt(tCanvasTopPosAftrSplit[0]) + parseInt(tCanvasHeightAftrSplit[0]); - - if ((evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) >= parseInt(tCanvasTopPosAftrSplit[0]) && (evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) < tCanvasAttr) { + if ((evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) >= parseInt(tCanvasTopPosAftrSplit[0]) && (evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) <= tCanvasAttr) { $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); } else { - $rootScope.getAnnotationTextBasedOnSelectedBodyRegion(event); + $rootScope.getAnnotationTextBasedOnSelectedBodyRegion(evt); } @@ -5554,7 +5546,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.annotationTextArrayT2 = []; $scope.annotationTextArrayT1.push(annotations.annotationT1); $scope.annotationTextArrayT2.push(annotations.annotationT2); - + $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); } else @@ -5563,7 +5555,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.annotationTextArrayT2 = []; $scope.annotationTextArrayT1.push(annotations.annotationT1); $scope.annotationTextArrayT2.push(annotations.annotationT2); - + $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false); } } -- libgit2 0.21.4