ADAM / AIAHTML5

Commit 4030dd38a68f931e63db7df90bf5858d8f7a0f3c

Authored by Amrita Vishnoi
2 parents 176e799f 07a84d7a

Merge branch 'citooltipissue' into Develop

Inline Side-by-side
Showing 3 changed files with 33 additions and 31 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @4030dd3
@@ -8395,20 +8395,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -8395,20 +8395,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
8395 } 8395 }
8396 8396
8397 8397
8398 - $rootScope.mouseMoveToolTip = function (toolTipTopPosition, toolTipLeftPosition, toolTipWidth, toolTipText) {  
8399 -  
8400 - $("#cursor-block").addClass("custom-tooltip-annotation-toolbar");  
8401 - $(".custom-tooltip-annotation-toolbar").css({ "display": "block", "top": toolTipTopPosition + "px", "width": toolTipWidth + "px", "left": toolTipLeftPosition + "px" });  
8402 - $("#cursor-block").html(toolTipText);  
8403 - }  
8404 -  
8405 - $rootScope.mouseOutToolTip = function () {  
8406 -  
8407 - $(".custom-tooltip-annotation-toolbar").css('display', 'none');  
8408 - $("#cursor-block").removeClass("custom-tooltip-annotation-toolbar");  
8409 - $("#cursor-block").html();  
8410 -  
8411 - }  
8412 8398
8413 $scope.OnSearchBtnClick = function (e) { 8399 $scope.OnSearchBtnClick = function (e) {
8414 8400
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @4030dd3
@@ -3336,5 +3336,21 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -3336,5 +3336,21 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3336 $("#adminModal").modal('hide'); 3336 $("#adminModal").modal('hide');
3337 $("adminAccessTextArea").text(''); 3337 $("adminAccessTextArea").text('');
3338 } 3338 }
  3339 +
  3340 +
  3341 + $rootScope.addToolTip = function (toolTipTopPosition, toolTipLeftPosition, toolTipWidth, toolTipText) {
  3342 +
  3343 + $("#cursor-block").addClass("custom-tooltip-annotation-toolbar");
  3344 + $(".custom-tooltip-annotation-toolbar").css({ "display": "block", "top": toolTipTopPosition + "px", "width": toolTipWidth + "px", "left": toolTipLeftPosition + "px" });
  3345 + $("#cursor-block").html(toolTipText);
  3346 + }
  3347 +
  3348 + $rootScope.remaveToolTipOnMouseOut = function () {
  3349 +
  3350 + $(".custom-tooltip-annotation-toolbar").css('display', 'none');
  3351 + $("#cursor-block").removeClass("custom-tooltip-annotation-toolbar");
  3352 + $("#cursor-block").html();
  3353 +
  3354 + }
3339 }] 3355 }]
3340 ); 3356 );
3341 \ No newline at end of file 3357 \ No newline at end of file
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @4030dd3
@@ -629,24 +629,24 @@ @@ -629,24 +629,24 @@
629 <div class="" aria-label="..."> 629 <div class="" aria-label="...">
630 <div class="" role="group" align="center"> 630 <div class="" role="group" align="center">
631 <div id="cursor-block" style="display: none; font-size:13px;"></div> 631 <div id="cursor-block" style="display: none; font-size:13px;"></div>
632 - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btnCursor" ng-mouseover="mouseMoveToolTip(75, 60, 120, 'Select Cursor(s)')" ng-mouseleave="mouseOutToolTip()" ng-click="Cursor()"><img src="content/images/icon-identity.png" alt="" title=""></button>  
633 - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-pin" ng-mouseover="mouseMoveToolTip(75, 100, 120, 'Draw Pin')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawPin($event)"><img src="content/images/draw-pin.png" alt="" title=""></button>  
634 - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-arrow" ng-mouseover="mouseMoveToolTip(75, 120, 120, 'Draw Arrow')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawArrow($event)"><img src="content/images/draw-arrow.png" alt="" title=""></button>  
635 - <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-Text" ng-mouseover="mouseMoveToolTip(75, 140, 120, 'Draw Text')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawText($event)"><img src="content/images/draw-text.png" alt="" title=""></button> 632 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btnCursor" ng-mouseover="addToolTip(75, 60, 120, 'Select Cursor(s)')" ng-mouseleave="remaveToolTipOnMouseOut()" ng-click="Cursor()"><img src="content/images/icon-identity.png" alt="" title=""></button>
  633 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-pin" ng-mouseover="addToolTip(75, 100, 120, 'Draw Pin')" ng-mouseleave="remaveToolTipOnMouseOut()" ng-click="DrawPin($event)"><img src="content/images/draw-pin.png" alt="" title=""></button>
  634 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-arrow" ng-mouseover="addToolTip(75, 120, 120, 'Draw Arrow')" ng-mouseleave="remaveToolTipOnMouseOut()" ng-click="DrawArrow($event)"><img src="content/images/draw-arrow.png" alt="" title=""></button>
  635 + <button type="button" class="btn btn-black-annotation btn-xs mrgnBtm5 btn-annotation btn-annotation-Text" ng-mouseover="addToolTip(75, 140, 120, 'Draw Text')" ng-mouseleave="remaveToolTipOnMouseOut()" ng-click="DrawText($event)"><img src="content/images/draw-text.png" alt="" title=""></button>
636 </div> 636 </div>
637 <div class="" role="group" align="center"> 637 <div class="" role="group" align="center">
638 - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-line" ng-mouseover="mouseMoveToolTip(95, 60, 120, 'Draw Line')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawLine($event)"><img src="content/images/draw-line.png" alt="" title=""></button>  
639 - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-rectangle" ng-mouseover="mouseMoveToolTip(95, 100, 120, 'Draw Rectangle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawRectangle($event)"><img src="content/images/draw-rec.png" alt="" title=""></button>  
640 - <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-circle" ng-mouseover="mouseMoveToolTip(95, 120, 120, 'Draw Circle')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawCircle($event)"><img src="content/images/draw-cir.png" alt="" title=""></button>  
641 - <!--<button type="button" class="btn btn-black-annotation btn-xs btn-annotation" ng-mouseover="mouseMoveToolTip(95, 140, 120, 'Draw Polygon')" ng-mouseleave="mouseOutToolTip()" ng-click="DrawPolygon($event)"><img src="content/images/draw-poly.png" alt="" title=""></button>--> 638 + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-line" ng-mouseover="addToolTip(95, 60, 120, 'Draw Line')" ng-mouseleave="remaveToolTipOnMouseOut()" ng-click="DrawLine($event)"><img src="content/images/draw-line.png" alt="" title=""></button>
  639 + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-rectangle" ng-mouseover="addToolTip(95, 100, 120, 'Draw Rectangle')" ng-mouseleave="remaveToolTipOnMouseOut()" ng-click="DrawRectangle($event)"><img src="content/images/draw-rec.png" alt="" title=""></button>
  640 + <button type="button" class="btn btn-black-annotation btn-xs btn-annotation btn-annotation-circle" ng-mouseover="addToolTip(95, 120, 120, 'Draw Circle')" ng-mouseleave="remaveToolTipOnMouseOut()" ng-click="DrawCircle($event)"><img src="content/images/draw-cir.png" alt="" title=""></button>
  641 + <!--<button type="button" class="btn btn-black-annotation btn-xs btn-annotation" ng-mouseover="addToolTip(95, 140, 120, 'Draw Polygon')" ng-mouseleave="remaveToolTipOnMouseOut()" ng-click="DrawPolygon($event)"><img src="content/images/draw-poly.png" alt="" title=""></button>-->
642 </div> 642 </div>
643 </div> 643 </div>
644 </div> 644 </div>
645 - <div class="well-popup well blankshapediv" ng-mouseover="mouseMoveToolTip(200, 170, 120, 'Edit Style')" ng-mouseleave="mouseOutToolTip()"> 645 + <div class="well-popup well blankshapediv" ng-mouseover="addToolTip(200, 170, 120, 'Edit Style')" ng-mouseleave="remaveToolTipOnMouseOut()">
646 <!--#7931--> 646 <!--#7931-->
647 647
648 <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div> 648 <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div>
649 - <div id="previewBorder" class="outlinediv" ng-mouseover="mouseMoveToolTip(170, 170, 120, 'Edit Style')" ng-mouseleave="mouseOutToolTip()"> 649 + <div id="previewBorder" class="outlinediv" ng-mouseover="addToolTip(170, 170, 120, 'Edit Style')" ng-mouseleave="remaveToolTipOnMouseOut()">
650 <div id="shapeStyleDiv" style="background-color: #ffffff;" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()"> 650 <div id="shapeStyleDiv" style="background-color: #ffffff;" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
651 651
652 </div> 652 </div>
@@ -656,23 +656,23 @@ @@ -656,23 +656,23 @@
656 <div class="well well-popup"> 656 <div class="well well-popup">
657 <div class="" role="group" aria-label="..."> 657 <div class="" role="group" aria-label="...">
658 <div> 658 <div>
659 - <a href="#canvasPaint" data-tool="marker" data-size="1" data-color="#fff" id="annotationpaintbrushsize" ng-mouseover="mouseMoveToolTip(270, 50, 120, 'Paint')" ng-mouseleave="mouseOutToolTip()" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-brush" role="button" data-placement="top" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a>  
660 - <a href="#canvasPaint" data-tool="eraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" data-size=" 1" id="annotationpainteraser" ng-click="EraseDrawing()" ng-mouseover="mouseMoveToolTip(270, 70, 120, 'Erase')" ng-mouseleave="mouseOutToolTip()" role="button"><i class=" fa fa-eraser"></i></a> 659 + <a href="#canvasPaint" data-tool="marker" data-size="1" data-color="#fff" id="annotationpaintbrushsize" ng-mouseover="addToolTip(270, 50, 120, 'Paint')" ng-mouseleave="remaveToolTipOnMouseOut()" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-brush" role="button" data-placement="top" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a>
  660 + <a href="#canvasPaint" data-tool="eraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" data-size=" 1" id="annotationpainteraser" ng-click="EraseDrawing()" ng-mouseover="addToolTip(270, 70, 120, 'Erase')" ng-mouseleave="remaveToolTipOnMouseOut()" role="button"><i class=" fa fa-eraser"></i></a>
661 661
662 - <!--<button type="button" id="annotationpainteraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="mouseMoveToolTip(270, 70, 120, 'Erase')" ng-mouseleave="mouseOutToolTip()"><i class="fa fa-eraser"></i></button>-->&nbsp; 662 + <!--<button type="button" id="annotationpainteraser" class="btn btn-black-annotation btn-xs pull-left btn-annotation btn-annotation-erase" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="addToolTip(270, 70, 120, 'Erase')" ng-mouseleave="remaveToolTipOnMouseOut()"><i class="fa fa-eraser"></i></button>-->&nbsp;
663 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;"> 663 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
664 - <div style="width: 58px; float: left;" ng-mouseover="mouseMoveToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()"> 664 + <div style="width: 58px; float: left;" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="remaveToolTipOnMouseOut()">
665 <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)"> 665 <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
666 </div> 666 </div>
667 <div style="width: 22px; float: left;"> 667 <div style="width: 22px; float: left;">
668 <div style="width: 100%; float: left; height: 16px;"> 668 <div style="width: 100%; float: left; height: 16px;">
669 - <button type="button" id="btnBrushSizeIncrement" ng-mouseover="mouseMoveToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;"> 669 + <button type="button" id="btnBrushSizeIncrement" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="remaveToolTipOnMouseOut()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
670 670
671 <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-up.png"> 671 <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-up.png">
672 </button> 672 </button>
673 </div> 673 </div>
674 <div style="width: 100%; float: left; height: 16px;"> 674 <div style="width: 100%; float: left; height: 16px;">
675 - <button type="button" id="btnBrushSizeDecrease" ng-mouseover="mouseMoveToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;"> 675 + <button type="button" id="btnBrushSizeDecrease" ng-mouseover="addToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="remaveToolTipOnMouseOut()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
676 <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-down.png"> 676 <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-down.png">
677 </button> 677 </button>
678 </div> 678 </div>
@@ -681,7 +681,7 @@ @@ -681,7 +681,7 @@
681 </div> 681 </div>
682 682
683 <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;"> 683 <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;">
684 - <div id="slider-range-min-2" ng-mouseover="mouseMoveToolTip(270, 170, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()"></div> 684 + <div id="slider-range-min-2" ng-mouseover="addToolTip(270, 170, 120, 'Brush Size')" ng-mouseleave="remaveToolTipOnMouseOut()"></div>
685 </div> 685 </div>
686 <div class="clearfix"></div> 686 <div class="clearfix"></div>
687 </div> 687 </div>