ADAM / AIAHTML5

Commit 9ba62fe9e03d578aa4e0b58b8f6355c2ff4e7690

Authored by Amrita Vishnoi
2 parents 59581a41 7435194e

Merge branch 'functionalityshowhide' into Develop

Inline Side-by-side
Showing 1 changed file with 51 additions and 19 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @9ba62fe
... ... @@ -2786,7 +2786,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2786 2786  
2787 2787  
2788 2788 $('.dynCross').on('click', function (evt) {
2789   - $(this).parent().parent().parent().css('display', 'none');
  2789 + //$(this).parent().parent().parent().css('display', 'none');
  2790 + $(this).parent().parent().parent().remove();
2790 2791  
2791 2792 });
2792 2793  
... ... @@ -2795,9 +2796,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2795 2796  
2796 2797 else {
2797 2798 $scope.multiAnnotationIsON = false;
  2799 +
  2800 + //$(".com").css("display", "none");
  2801 + //$("#bord").css({ "width": "0px", "display": "none" });
  2802 + $(".com").remove();
  2803 + $("#bord").remove();
2798 2804  
2799   - $(".com").css("display", "none");
2800   - $("#bord").css({ "width": "0px", "display": "none" });
2801 2805 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>'
2802 2806 + '<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:#fff;text-align:left;font-size:12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;">'
2803 2807 + '<span style="position:absolute;right:0px;top:0px;color:#ffffff;cursor:pointer;">'
... ... @@ -2901,7 +2905,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2901 2905 {
2902 2906 drag: function (evt) {
2903 2907  
2904   - $("#dot").css("display", "none");
  2908 + //$("#dot").css("display", "none");
  2909 + $("#dot").css("visibility", "hidden");
2905 2910 var verticalScrollPosition = canvasDiv.scrollTop;
2906 2911 var horizontlScrollPosition = canvasDiv.scrollLeft;
2907 2912 $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
2912 2917  
2913 2918  
2914 2919 $('.crossDiv_temp').on('click', function (evt) {
2915   - $('#sppeachBubble').css('display', 'none');
  2920 + //$('#sppeachBubble').css('display', 'none');
2916 2921  
2917   - $("#bord").css("display", "none");
2918   - $("#dot").css("display", "none");
  2922 + //$("#bord").css("display", "none");
  2923 + //$("#dot").css("display", "none");
  2924 + $('#sppeachBubble').remove();
2919 2925  
  2926 + $("#bord").remove();
  2927 + $("#dot").remove();
2920 2928  
2921 2929 });
2922 2930  
... ... @@ -3147,8 +3155,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3147 3155  
3148 3156  
3149 3157 $('.dynCross_anno').on('click', function (evt) {
3150   - $(this).parent().parent().parent().css('display', 'none');
3151   -
  3158 + //$(this).parent().parent().parent().css('display', 'none');
  3159 + $(this).parent().parent().parent().remove();
3152 3160 // $("#bord").css("display", "none");
3153 3161 // $("#dot").css("display", "none");
3154 3162  
... ... @@ -3160,12 +3168,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3160 3168 }
3161 3169  
3162 3170 else {
3163   -
  3171 +
3164 3172 $scope.multiAnnotationIsON = false;
3165 3173  
3166 3174 $(".com_annotation").css("display", "none");
3167 3175 $("#bord_annotation").css({ "width": "0px", "display": "none" });
3168   -
  3176 + $('.dynCross_anno').parent().parent().parent().remove();
3169 3177 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>'
3170 3178 + '<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:#fff;text-align:left;font-size:12px;background-color:#19100e;font-weight:bold;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;">'
3171 3179 + '<span style="position:absolute;right:0px;top:0px;color:#ffffff;cursor:pointer;">'
... ... @@ -3342,7 +3350,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3342 3350 {
3343 3351 drag: function (evt) {
3344 3352  
3345   - $("#dot_annotation").css("display", "none");
  3353 + //$("#dot_annotation").css("display", "none");
  3354 + $("#dot_annotation").remove();
  3355 +
3346 3356 var verticalScrollPosition = canvasDiv.scrollTop;
3347 3357 var horizontlScrollPosition = canvasDiv.scrollLeft;
3348 3358 $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
3353 3363  
3354 3364  
3355 3365 $('.crossDiv_temp_annotation').on('click', function (evt) {
3356   - $('#sppeachBubble_annotation').css('display', 'none');
  3366 + //$('#sppeachBubble_annotation').css('display', 'none');
3357 3367  
3358   - $("#bord_annotation").css("display", "none");
3359   - $("#dot_annotation").css("display", "none");
  3368 + //$("#bord_annotation").css("display", "none");
  3369 + //$("#dot_annotation").css("display", "none");
3360 3370  
3361 3371  
  3372 + $('#sppeachBubble_annotation').remove();
  3373 +
  3374 + $("#bord_annotation").remove();
  3375 + $("#dot_annotation").remove();
  3376 +
3362 3377 });
3363 3378 }
3364 3379  
... ... @@ -3638,6 +3653,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3638 3653  
3639 3654 //alert('mouse up');
3640 3655 console.log('MOUSE UP');
  3656 + $(".com").remove();
  3657 + $('#dot').remove();
  3658 + $('#bord').remove();
  3659 + $('#sppeachBubble').remove();
3641 3660  
3642 3661 $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
3643 3662 $('.rectangle').remove();
... ... @@ -4656,11 +4675,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4656 4675 $scope.isTransparencyActivated = false;
4657 4676 $("#btnExtract").removeClass("disabled");
4658 4677  
4659   - $('.com_anno').css('display', 'none');
  4678 + //$('.com_anno').css('display', 'none');
  4679 +
  4680 + //$('#sppeachBubble_annotation').css('display', 'none');
  4681 + //$('#dot_annotation').css('display', 'none');
  4682 + //$('#bord_annotation').css('display', 'none');
4660 4683  
4661   - $('#sppeachBubble_annotation').css('display', 'none');
4662   - $('#dot_annotation').css('display', 'none');
4663   - $('#bord_annotation').css('display', 'none');
  4684 +
  4685 + $('.com_anno').remove();
  4686 +
  4687 + $('#sppeachBubble_annotation').remove();
  4688 + $('#dot_annotation').remove();
  4689 + $('#bord_annotation').remove();
4664 4690  
4665 4691 var tBox = document.getElementById('transparencyCanvas');
4666 4692  
... ... @@ -5257,7 +5283,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5257 5283  
5258 5284 $(".com").toggle();
5259 5285 $('#dot').toggle();
  5286 + $('#bord').toggle();
5260 5287 $('#sppeachBubble').toggle();
  5288 + $('#sppeachBubble_annotation').toggle();
  5289 +
  5290 + $("#bord_annotation").toggle();
  5291 + $("#dot_annotation").toggle();
  5292 + $(".dynCross_anno").parent().parent().parent().toggle();
5261 5293  
5262 5294 }
5263 5295  
... ...