Merge branch 'functionalityshowhide' into Develop

Amrita Vishnoi
2 parents 59581a41 7435194e
Showing 1 changed file with 51 additions and 19 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -2786,7 +2786,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 $('.dynCross').on('click', function (evt) {
-                    $(this).parent().parent().parent().css('display', 'none');
+                    //$(this).parent().parent().parent().css('display', 'none');
+                    $(this).parent().parent().parent().remove();
                 });
@@ -2795,9 +2796,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             else {
                 $scope.multiAnnotationIsON = false;
+              
+                //$(".com").css("display", "none");
+                //$("#bord").css({ "width": "0px", "display": "none" });
+                $(".com").remove();
+                $("#bord").remove();
-                $(".com").css("display", "none");
-                $("#bord").css({ "width": "0px", "display": "none" });
                 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>'
            + '<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;">'
            + '<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
          {
              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 = '<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>'
            + '<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;">'
            + '<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
              {
                  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();
     }