ADAM / AIAHTML5

Commit f7df98cf1ad0141b74aef96f9e2ead5d92c72c80

Authored by Amrita Vishnoi
2 parents 47230416 906770d3

Merge branch 'dotissuewithannotation' into Develop

Inline Side-by-side
Showing 1 changed file with 6 additions and 0 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @f7df98c
@@ -3910,6 +3910,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3910,6 +3910,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3910 document.getElementById('dot').style.display = 'block'; 3910 document.getElementById('dot').style.display = 'block';
3911 document.getElementById('dot').style.left = ((Globe[0].currentX) - 10) + 'px'; 3911 document.getElementById('dot').style.left = ((Globe[0].currentX) - 10) + 'px';
3912 document.getElementById('dot').style.top = ((Globe[0].currentY) + 10) + 'px'; 3912 document.getElementById('dot').style.top = ((Globe[0].currentY) + 10) + 'px';
  3913 + document.getElementById('bord').style.display = 'block';
  3914 + document.getElementById('bord').style.left = ((Globe[0].currentX) - 2) + 'px';
  3915 + document.getElementById('bord').style.top = ((Globe[0].currentY) + 1) + 'px';
3913 document.getElementById('sppeachBubble').style.display = 'block'; 3916 document.getElementById('sppeachBubble').style.display = 'block';
3914 document.getElementById('sppeachBubble').style.left = (Globe[0].currentX) + 'px'; 3917 document.getElementById('sppeachBubble').style.left = (Globe[0].currentX) + 'px';
3915 document.getElementById('sppeachBubble').style.top = (Globe[0].currentY) + 'px'; 3918 document.getElementById('sppeachBubble').style.top = (Globe[0].currentY) + 'px';
@@ -4108,6 +4111,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -4108,6 +4111,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4108 document.getElementById('dot_annotation').style.display = 'block'; 4111 document.getElementById('dot_annotation').style.display = 'block';
4109 document.getElementById('dot_annotation').style.left = ((Globe[0].currentX) - 10) + 'px'; 4112 document.getElementById('dot_annotation').style.left = ((Globe[0].currentX) - 10) + 'px';
4110 document.getElementById('dot_annotation').style.top = ((Globe[0].currentY) + 10) + 'px'; 4113 document.getElementById('dot_annotation').style.top = ((Globe[0].currentY) + 10) + 'px';
  4114 + document.getElementById('bord_annotation').style.display = 'block';
  4115 + document.getElementById('bord_annotation').style.left = ((Globe[0].currentX) - 2) + 'px';
  4116 + document.getElementById('bord_annotation').style.top = ((Globe[0].currentY) + 1) + 'px';
4111 document.getElementById('sppeachBubble_annotation').style.display = 'block'; 4117 document.getElementById('sppeachBubble_annotation').style.display = 'block';
4112 document.getElementById('sppeachBubble_annotation').style.left = (Globe[0].currentX) + 'px'; 4118 document.getElementById('sppeachBubble_annotation').style.left = (Globe[0].currentX) + 'px';
4113 document.getElementById('sppeachBubble_annotation').style.top = (Globe[0].currentY) + 'px'; 4119 document.getElementById('sppeachBubble_annotation').style.top = (Globe[0].currentY) + 'px';