'
@@ -2901,7 +2905,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
{
drag: function (evt) {
- $("#dot").css("display", "none");
+ //$("#dot").css("display", "none");
+ $("#dot").css("visibility", "hidden");
var verticalScrollPosition = canvasDiv.scrollTop;
var horizontlScrollPosition = canvasDiv.scrollLeft;
$scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
@@ -2912,11 +2917,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$('.crossDiv_temp').on('click', function (evt) {
- $('#sppeachBubble').css('display', 'none');
+ //$('#sppeachBubble').css('display', 'none');
- $("#bord").css("display", "none");
- $("#dot").css("display", "none");
+ //$("#bord").css("display", "none");
+ //$("#dot").css("display", "none");
+ $('#sppeachBubble').remove();
+ $("#bord").remove();
+ $("#dot").remove();
});
@@ -3147,8 +3155,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$('.dynCross_anno').on('click', function (evt) {
- $(this).parent().parent().parent().css('display', 'none');
-
+ //$(this).parent().parent().parent().css('display', 'none');
+ $(this).parent().parent().parent().remove();
// $("#bord").css("display", "none");
// $("#dot").css("display", "none");
@@ -3160,12 +3168,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
}
else {
-
+
$scope.multiAnnotationIsON = false;
$(".com_annotation").css("display", "none");
$("#bord_annotation").css({ "width": "0px", "display": "none" });
-
+ $('.dynCross_anno').parent().parent().parent().remove();
var sppechBubbleDotHTML_annotation = ''
+ ''
+ ''
@@ -3342,7 +3350,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
{
drag: function (evt) {
- $("#dot_annotation").css("display", "none");
+ //$("#dot_annotation").css("display", "none");
+ $("#dot_annotation").remove();
+
var verticalScrollPosition = canvasDiv.scrollTop;
var horizontlScrollPosition = canvasDiv.scrollLeft;
$scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
@@ -3353,12 +3363,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$('.crossDiv_temp_annotation').on('click', function (evt) {
- $('#sppeachBubble_annotation').css('display', 'none');
+ //$('#sppeachBubble_annotation').css('display', 'none');
- $("#bord_annotation").css("display", "none");
- $("#dot_annotation").css("display", "none");
+ //$("#bord_annotation").css("display", "none");
+ //$("#dot_annotation").css("display", "none");
+ $('#sppeachBubble_annotation').remove();
+
+ $("#bord_annotation").remove();
+ $("#dot_annotation").remove();
+
});
}
@@ -3638,6 +3653,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
//alert('mouse up');
console.log('MOUSE UP');
+ $(".com").remove();
+ $('#dot').remove();
+ $('#bord').remove();
+ $('#sppeachBubble').remove();
$scope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
$('.rectangle').remove();
@@ -4656,11 +4675,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$scope.isTransparencyActivated = false;
$("#btnExtract").removeClass("disabled");
- $('.com_anno').css('display', 'none');
+ //$('.com_anno').css('display', 'none');
+
+ //$('#sppeachBubble_annotation').css('display', 'none');
+ //$('#dot_annotation').css('display', 'none');
+ //$('#bord_annotation').css('display', 'none');
- $('#sppeachBubble_annotation').css('display', 'none');
- $('#dot_annotation').css('display', 'none');
- $('#bord_annotation').css('display', 'none');
+
+ $('.com_anno').remove();
+
+ $('#sppeachBubble_annotation').remove();
+ $('#dot_annotation').remove();
+ $('#bord_annotation').remove();
var tBox = document.getElementById('transparencyCanvas');
@@ -5257,7 +5283,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$(".com").toggle();
$('#dot').toggle();
+ $('#bord').toggle();
$('#sppeachBubble').toggle();
+ $('#sppeachBubble_annotation').toggle();
+
+ $("#bord_annotation").toggle();
+ $("#dot_annotation").toggle();
+ $(".dynCross_anno").parent().parent().parent().toggle();
}