ADAM / AIAHTML5

Commit 7435194ed47b9c88c240fa38821d63169496c52e

Authored by Mukul Rajput
1 parent eea69634

remove dynamic divs for work fine of Hide and show Functionality

Inline Side-by-side
Showing 1 changed file with 51 additions and 19 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @7435194
... ... @@ -2691,7 +2691,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2691 2691  
2692 2692  
2693 2693 $('.dynCross').on('click', function (evt) {
2694   - $(this).parent().parent().parent().css('display', 'none');
  2694 + //$(this).parent().parent().parent().css('display', 'none');
  2695 + $(this).parent().parent().parent().remove();
2695 2696  
2696 2697 });
2697 2698  
... ... @@ -2700,9 +2701,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2700 2701  
2701 2702 else {
2702 2703 $scope.multiAnnotationIsON = false;
  2704 +
  2705 + //$(".com").css("display", "none");
  2706 + //$("#bord").css({ "width": "0px", "display": "none" });
  2707 + $(".com").remove();
  2708 + $("#bord").remove();
2703 2709  
2704   - $(".com").css("display", "none");
2705   - $("#bord").css({ "width": "0px", "display": "none" });
2706 2710 var sppechBubbleDotHTML = '<div id="dot" style="position:absolute;height:15px;width:35px;display:none;z-index:10000;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);"></div>'
2707 2711 + '<div id="sppeachBubble" style="height:auto!important;z-index:10000;margin-left:25px;border:1px solid #000;display:none;padding:5px 10px;position:absolute;color:#000;text-align:left;font-size:12px;background-color:#fff;font-weight:bold;">'
2708 2712 + '<span style="position:absolute;right:-4px;top:-4px;color:#ffffff;cursor:pointer;">'
... ... @@ -2806,7 +2810,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2806 2810 {
2807 2811 drag: function (evt) {
2808 2812  
2809   - $("#dot").css("display", "none");
  2813 + //$("#dot").css("display", "none");
  2814 + $("#dot").css("visibility", "hidden");
2810 2815 var verticalScrollPosition = canvasDiv.scrollTop;
2811 2816 var horizontlScrollPosition = canvasDiv.scrollLeft;
2812 2817 $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
... ... @@ -2817,11 +2822,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2817 2822  
2818 2823  
2819 2824 $('.crossDiv_temp').on('click', function (evt) {
2820   - $('#sppeachBubble').css('display', 'none');
  2825 + //$('#sppeachBubble').css('display', 'none');
2821 2826  
2822   - $("#bord").css("display", "none");
2823   - $("#dot").css("display", "none");
  2827 + //$("#bord").css("display", "none");
  2828 + //$("#dot").css("display", "none");
  2829 + $('#sppeachBubble').remove();
2824 2830  
  2831 + $("#bord").remove();
  2832 + $("#dot").remove();
2825 2833  
2826 2834 });
2827 2835  
... ... @@ -3052,8 +3060,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3052 3060  
3053 3061  
3054 3062 $('.dynCross_anno').on('click', function (evt) {
3055   - $(this).parent().parent().parent().css('display', 'none');
3056   -
  3063 + //$(this).parent().parent().parent().css('display', 'none');
  3064 + $(this).parent().parent().parent().remove();
3057 3065 // $("#bord").css("display", "none");
3058 3066 // $("#dot").css("display", "none");
3059 3067  
... ... @@ -3065,12 +3073,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3065 3073 }
3066 3074  
3067 3075 else {
3068   -
  3076 +
3069 3077 $scope.multiAnnotationIsON = false;
3070 3078  
3071 3079 $(".com_annotation").css("display", "none");
3072 3080 $("#bord_annotation").css({ "width": "0px", "display": "none" });
3073   -
  3081 + $('.dynCross_anno').parent().parent().parent().remove();
3074 3082 var sppechBubbleDotHTML_annotation = '<div id="dot_annotation" style="position:absolute;height:15px;width:35px;display:none;z-index:10000;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);"></div>'
3075 3083 + '<div id="sppeachBubble_annotation" style="height:auto!important;z-index:10000;margin-left:25px;border:1px solid #000;display:none;padding:5px 10px;position:absolute;color:#000;text-align:left;font-size:12px;background-color:#fff;font-weight:bold;">'
3076 3084 + '<span style="position:absolute;right:-4px;top:-4px;color:#ffffff;cursor:pointer;">'
... ... @@ -3247,7 +3255,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3247 3255 {
3248 3256 drag: function (evt) {
3249 3257  
3250   - $("#dot_annotation").css("display", "none");
  3258 + //$("#dot_annotation").css("display", "none");
  3259 + $("#dot_annotation").remove();
  3260 +
3251 3261 var verticalScrollPosition = canvasDiv.scrollTop;
3252 3262 var horizontlScrollPosition = canvasDiv.scrollLeft;
3253 3263 $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
... ... @@ -3258,12 +3268,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3258 3268  
3259 3269  
3260 3270 $('.crossDiv_temp_annotation').on('click', function (evt) {
3261   - $('#sppeachBubble_annotation').css('display', 'none');
  3271 + //$('#sppeachBubble_annotation').css('display', 'none');
3262 3272  
3263   - $("#bord_annotation").css("display", "none");
3264   - $("#dot_annotation").css("display", "none");
  3273 + //$("#bord_annotation").css("display", "none");
  3274 + //$("#dot_annotation").css("display", "none");
3265 3275  
3266 3276  
  3277 + $('#sppeachBubble_annotation').remove();
  3278 +
  3279 + $("#bord_annotation").remove();
  3280 + $("#dot_annotation").remove();
  3281 +
3267 3282 });
3268 3283 }
3269 3284  
... ... @@ -3543,6 +3558,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3543 3558  
3544 3559 //alert('mouse up');
3545 3560 console.log('MOUSE UP');
  3561 + $(".com").remove();
  3562 + $('#dot').remove();
  3563 + $('#bord').remove();
  3564 + $('#sppeachBubble').remove();
3546 3565  
3547 3566 $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
3548 3567 $('.rectangle').remove();
... ... @@ -4556,11 +4575,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4556 4575 $scope.isTransparencyActivated = false;
4557 4576 $("#btnExtract").removeClass("disabled");
4558 4577  
4559   - $('.com_anno').css('display', 'none');
  4578 + //$('.com_anno').css('display', 'none');
  4579 +
  4580 + //$('#sppeachBubble_annotation').css('display', 'none');
  4581 + //$('#dot_annotation').css('display', 'none');
  4582 + //$('#bord_annotation').css('display', 'none');
4560 4583  
4561   - $('#sppeachBubble_annotation').css('display', 'none');
4562   - $('#dot_annotation').css('display', 'none');
4563   - $('#bord_annotation').css('display', 'none');
  4584 +
  4585 + $('.com_anno').remove();
  4586 +
  4587 + $('#sppeachBubble_annotation').remove();
  4588 + $('#dot_annotation').remove();
  4589 + $('#bord_annotation').remove();
4564 4590  
4565 4591 var tBox = document.getElementById('transparencyCanvas');
4566 4592  
... ... @@ -5056,7 +5082,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5056 5082  
5057 5083 $(".com").toggle();
5058 5084 $('#dot').toggle();
  5085 + $('#bord').toggle();
5059 5086 $('#sppeachBubble').toggle();
  5087 + $('#sppeachBubble_annotation').toggle();
  5088 +
  5089 + $("#bord_annotation").toggle();
  5090 + $("#dot_annotation").toggle();
  5091 + $(".dynCross_anno").parent().parent().parent().toggle();
5060 5092  
5061 5093 }
5062 5094  
... ...