ADAM / AIAHTML5

Commit 77497b23d940ef5732a49750af67507537006227

Authored by Nikita Kulshreshtha
2 parents 73199bbe 09936044

Merge branch 'AnnoSpeechBubbleRedesign' into Develop

Inline Side-by-side
Showing 1 changed file with 9 additions and 9 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @77497b2
... ... @@ -2761,8 +2761,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2761 2761 $(".com").css("display", "none");
2762 2762 $("#bord").css({ "width": "0px", "display": "none" });
2763 2763 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>'
2764   - + '<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;">'
2765   - + '<span style="position:absolute;right:-4px;top:-4px;color:#ffffff;cursor:pointer;">'
  2764 + + '<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;">'
  2765 + + '<span style="position:absolute;right:0px;top:0px;color:#ffffff;cursor:pointer;">'
2766 2766 + '<img class="crossDiv_temp" src=' + $rootScope.path + '></span></div>'
2767 2767  
2768 2768 + '<div style="position:absolute;border:1px solid #000;display:none;z-index:9000;" id="bord">'
... ... @@ -2903,7 +2903,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2903 2903 var Exists_annotation = $("#canvasDiv").find("div[id=" + pointClicked_annotation + "]").length;
2904 2904 // alert(Exists_annotation);
2905 2905 // alert(pointClicked_annotation);
2906   - var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.j + "'></div><div data=" + $scope.j + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#000;text-align:left;font-size: 12px;background-color:#fff;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-4px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord_annotation" + $scope.j + "'></div></div>";
  2906 + var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.j + "'></div><div data=" + $scope.j + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:10000;margin-left:25px;border:1px solid #000;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;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:0px;top:0px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord_annotation" + $scope.j + "'></div></div>";
2907 2907 if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
2908 2908 if (Exists_annotation == 0) {
2909 2909 $("#canvasDiv").append(sppechBubbleHTML_annotation);
... ... @@ -3006,7 +3006,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3006 3006 $("#" + sub_id_annotation).append("<p style='margin-bottom:2px;'>" + MultipleLang_annotation_T1 + "</p>");
3007 3007 }
3008 3008  
3009   - $("#" + sub_id_annotation).append("<p style='border-bottom:1px solid black;margin-bottom:0;'></p>");
  3009 + $("#" + sub_id_annotation).append("<p style='border-bottom:1px dotted white;margin-bottom:0;'></p>");
3010 3010  
3011 3011 for (var k = 0; k <= $scope.annotationTextArrayT2.length - 1; k++) {
3012 3012 var MultipleLang_annotation_T2 = $scope.annotationTextArrayT2[k];
... ... @@ -3129,8 +3129,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3129 3129 $("#bord_annotation").css({ "width": "0px", "display": "none" });
3130 3130  
3131 3131 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>'
3132   - + '<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;">'
3133   - + '<span style="position:absolute;right:-4px;top:-4px;color:#ffffff;cursor:pointer;">'
  3132 + + '<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;">'
  3133 + + '<span style="position:absolute;right:0px;top:0px;color:#ffffff;cursor:pointer;">'
3134 3134 + '<img class="crossDiv_temp_annotation" src=' + $rootScope.path + '></span></div>'
3135 3135  
3136 3136 + '<div style="position:absolute;border:1px solid #000;display:none;z-index:9000;" id="bord_annotation">'
... ... @@ -3147,7 +3147,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3147 3147 $("#sppeachBubble_annotation").append("<p style='margin-bottom:2px;'>" + MultipleLang_annotation_T1 + "</p>");
3148 3148 }
3149 3149  
3150   - $("#sppeachBubble_annotation").append("<p style='border-bottom:1px solid black;margin-bottom:0;'></p>");
  3150 + $("#sppeachBubble_annotation").append("<p style='border-bottom:1px dotted white;margin-bottom:0;'></p>");
3151 3151  
3152 3152 for (var k = 0; k <= $scope.annotationTextArrayT2.length - 1; k++) {
3153 3153 var MultipleLang_annotation_T2 = $scope.annotationTextArrayT2[k];
... ... @@ -3224,7 +3224,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3224 3224 $("#sppeachBubble_annotation").append("<p style='margin-bottom:2px;'>" + MultipleLang_annotation_T1 + "</p>");
3225 3225 }
3226 3226  
3227   - $("#sppeachBubble_annotation").append("<p style='border-bottom:1px solid black;margin-bottom:0;'></p>");
  3227 + $("#sppeachBubble_annotation").append("<p style='border-bottom:1px dotted white;margin-bottom:0;'></p>");
3228 3228  
3229 3229 for (var k = 0; k <= $scope.annotationTextArrayT2.length - 1; k++) {
3230 3230 var MultipleLang_annotation_T2 = $scope.annotationTextArrayT2[k];
... ... @@ -3334,7 +3334,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3334 3334 }
3335 3335  
3336 3336 $scope.createSpeechBubbleBasedOnAnnotationLength = function (pointClicked, x, y, id) {
3337   - var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.speechBubbleCounter + "'></div><div data=" + $scope.speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#000;text-align:left;font-size: 12px;background-color:#fff;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-4px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.speechBubbleCounter + " class='dynCross' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.speechBubbleCounter + "'></div></div>";
  3337 + var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.speechBubbleCounter + "'></div><div data=" + $scope.speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:10000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;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;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:0px;top:0px;color:#ffffff;cursor:pointer;'><img id=" + $scope.speechBubbleCounter + " class='dynCross' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.speechBubbleCounter + "'></div></div>";
3338 3338 //Issue #7286 :Undefined annotation should not appear
3339 3339 for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
3340 3340 var annotation = $scope.MultiLanguageAnnationArray[i];
... ...