ADAM / AIAHTML5

Commit 2882e40902d1cbc3db2921dc16d322236f152530

Authored by Birendra
1 parent a83adff4

fixed click below leader line in DA

Inline Side-by-side
Showing 2 changed files with 10 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @2882e40
... ... @@ -4030,7 +4030,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4030 4030 }
4031 4031  
4032 4032 $scope.createSpeechBubbleBasedOnAnnotationLength = function (pointClicked, x, y, id) {
4033   - var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div style='z-index:60000;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:60000;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:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.speechBubbleCounter + " class='dynCross' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.speechBubbleCounter + "'></div></div>";
  4033 + var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com'><div style='z-index:60000;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);width:35px;left:" + (x - 6) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.speechBubbleCounter + "'></div><div data=" + $scope.speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:60000;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:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.speechBubbleCounter + " class='dynCross' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + $scope.speechBubbleCounter + "'></div></div>";
4034 4034 //Issue #7286 :Undefined annotation should not appear
4035 4035 for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
4036 4036 var annotation = $scope.MultiLanguageAnnationArray[i];
... ... @@ -4085,7 +4085,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4085 4085  
4086 4086  
4087 4087  
4088   - 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>'
  4088 + var sppechBubbleDotHTML = '<div id="dot" style="position:absolute;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>'
4089 4089 + '<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;">'
4090 4090 + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">'
4091 4091 + '<img class="crossDiv_temp" style="width:18px" src=' + $rootScope.path + '></span></div>'
... ... @@ -4163,8 +4163,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4163 4163 var Globe = [];
4164 4164 Globe.push({ currentX: x, currentY: y });
4165 4165 document.getElementById('dot').style.display = 'block';
4166   - document.getElementById('dot').style.left = ((Globe[0].currentX) - 10) + 'px';
4167   - document.getElementById('dot').style.top = ((Globe[0].currentY) + 10) + 'px';
  4166 + document.getElementById('dot').style.left = ((Globe[0].currentX) - 6) + 'px';
  4167 + document.getElementById('dot').style.top = ((Globe[0].currentY) + 11) + 'px';
4168 4168 document.getElementById('bord').style.display = 'block';
4169 4169 document.getElementById('bord').style.left = ((Globe[0].currentX) - 2) + 'px';
4170 4170 document.getElementById('bord').style.top = ((Globe[0].currentY) + 1) + 'px';
... ... @@ -4177,7 +4177,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4177 4177 }
4178 4178 $scope.createSpeechBubbleBasedOnTransparencyWithCtrl = function (pointClicked_annotation, Exists_annotation, x, y, sub_id_annotation) {
4179 4179  
4180   - var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div style='z-index:59000;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:60000;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:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:59000;' id='bord_annotation" + $scope.j + "'></div></div>";
  4180 + var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div style='z-index:59000;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);width:35px;left:" + (x - 6) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.j + "'></div><div data=" + $scope.j + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:60000;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:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:59000;' id='bord_annotation" + $scope.j + "'></div></div>";
4181 4181 if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
4182 4182 if (Exists_annotation == 0) {
4183 4183 $("#canvasDiv").append(sppechBubbleHTML_annotation);
... ... @@ -4272,7 +4272,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4272 4272 $("#bord_annotation").remove();
4273 4273 $("#sppeachBubble_annotation").remove();
4274 4274 $("#dot_annotation").remove();
4275   - var sppechBubbleDotHTML_annotation = '<div id="dot_annotation" style="position:absolute;height:15px;width:35px;display:none;z-index:59000;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>'
  4275 + var sppechBubbleDotHTML_annotation = '<div id="dot_annotation" style="position:absolute;width:35px;display:none;z-index:59000;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>'
4276 4276 + '<div id="sppeachBubble_annotation" style="height:auto!important;z-index:60000;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;">'
4277 4277 + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">'
4278 4278 + '<img class="crossDiv_temp_annotation" style="width:18px" src=' + $rootScope.path + '></span></div>'
... ... @@ -4364,8 +4364,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4364 4364 var Globe = [];
4365 4365 Globe.push({ currentX: x, currentY: y });
4366 4366 document.getElementById('dot_annotation').style.display = 'block';
4367   - document.getElementById('dot_annotation').style.left = ((Globe[0].currentX) - 10) + 'px';
4368   - document.getElementById('dot_annotation').style.top = ((Globe[0].currentY) + 10) + 'px';
  4367 + document.getElementById('dot_annotation').style.left = ((Globe[0].currentX) - 6) + 'px';
  4368 + document.getElementById('dot_annotation').style.top = ((Globe[0].currentY) + 11) + 'px';
4369 4369 document.getElementById('bord_annotation').style.display = 'block';
4370 4370 document.getElementById('bord_annotation').style.left = ((Globe[0].currentX) - 2) + 'px';
4371 4371 document.getElementById('bord_annotation').style.top = ((Globe[0].currentY) + 1) + 'px';
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @2882e40
... ... @@ -1189,7 +1189,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1189 1189 $scope.isAnnotationDivAlreadyPresent = true;
1190 1190 }
1191 1191 if ($scope.isAnnotationDivAlreadyPresent == true) {
1192   - var speechBubbleHTML = '<div id="speechBubbleLine' + PinId + '" style="position:absolute;height:15px;width:35px;display:none;z-index:13000;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>'
  1192 + var speechBubbleHTML = '<div id="speechBubbleLine' + PinId + '" style="position:absolute;width:35px;display:none;z-index:13000;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>'
1193 1193 + '<div id="speechBubble' + PinId + '" class="common-drag" style="height:auto!important;z-index:13000;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;">'
1194 1194 + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">'
1195 1195 + '<img id="closeBtn' + PinId + ' " class="crossDiv_temp" style="width:18px" src=' + $rootScope.closeBtnImgPath + '></span></div>'
... ... @@ -1271,7 +1271,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1271 1271 $rootScope.speechBubbleDimaensions.push({ "currentX": x, "currentY": y, "id": PinId });
1272 1272 speechBubbleDims.push({ currentX: x, currentY: y });
1273 1273 document.getElementById('speechBubbleLine' + PinId + '').style.display = 'block';
1274   - document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 12)) + 'px';
  1274 + document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 10)) + 'px';
1275 1275 if ($scope.sliderVal == 25) {
1276 1276 document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY + 5)) + 'px';
1277 1277 }
... ...