ADAM / AIAHTML5

Commit 700f8c1195dc674cfe5f20bb038dbd26d7451085

Authored by unknown
1 parent c104acf4

Commit changes for Issue ref #9016:Annotation > When text box is opened, view pa… 

…ge should get disabled.
Inline Side-by-side
Showing 2 changed files with 23 additions and 17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @700f8c1
... ... @@ -385,6 +385,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
385 385 $(".btn-annotation-arrow").addClass("activebtncolor");
386 386 }
387 387 $rootScope.DrawText = function () {
  388 +
388 389 $rootScope.setListManagerZindex = true;
389 390 $("#canvasPaint").css("display", "block");
390 391 $("#canvas").css("display", "block");
... ... @@ -972,6 +973,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
972 973 $rootScope.TextID = TextAreaRectNameConcat;
973 974  
974 975 $rootScope.rectDimension.push({ width: layer.width, height: layer.height, x: layer.x, y: layer.y });
  976 + $("#annotationTextModal").css("padding-right", "0px");
  977 + document.getElementById('modelbackground').style.display = "block";
975 978 $("#annotationTextModal").modal("toggle");
976 979  
977 980 $("#text_area").val('');
... ... @@ -1023,7 +1026,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1023 1026 }
1024 1027 });
1025 1028  
1026   -
  1029 + $("#annotationTextModal").css("padding-right", "0px");
1027 1030 $("#annotationTextModal").modal("toggle");
1028 1031 $('.btnCursor').trigger('click');
1029 1032 $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": "#000000" });
... ... @@ -1159,6 +1162,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1159 1162  
1160 1163 break;
1161 1164 case "TextArea":
  1165 + document.getElementById('modelbackground').style.display = "block";
1162 1166 $rootScope.IsTextAlreadySave = false;
1163 1167 $("#text_area").val('');
1164 1168 // Draw text
... ... @@ -1184,7 +1188,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1184 1188 ///-----
1185 1189  
1186 1190 $rootScope.saveText = function () {
1187   -
  1191 + document.getElementById('modelbackground').style.display = "none";
1188 1192 // this part will work first time when save button will be clicked
1189 1193 if ($rootScope.IsTextAlreadySave == false) {
1190 1194 // getting textarea style properties
... ... @@ -1424,6 +1428,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1424 1428  
1425 1429 // _rectLayerOnSaveSplitInt = '';
1426 1430 textArrVal = '';
  1431 + $("#annotationTextModal").css("padding-right", "0px");
  1432 + document.getElementById('modelbackground').style.display = "block";
1427 1433 $("#annotationTextModal").modal("toggle");
1428 1434  
1429 1435  
... ... @@ -1626,7 +1632,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1626 1632  
1627 1633 }
1628 1634  
1629   -
  1635 + document.getElementById('modelbackground').style.display = "block";
1630 1636 $("#annotationTextModal").modal("toggle");
1631 1637 },
1632 1638 mouseout: function (layer) {
... ... @@ -1711,12 +1717,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1711 1717  
1712 1718 $rootScope.closeModal = function () {
1713 1719  
  1720 + document.getElementById('modelbackground').style.display = "none";
  1721 +
  1722 + //if ($rootScope.isTextAreaClosedButtonActive == true) {
  1723 + // $("#canvas").removeLayer('TextArea_' + $rootScope.TextNumber).drawLayers();
  1724 + // $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();
1714 1725  
1715   - if ($rootScope.isTextAreaClosedButtonActive == true) {
1716   - $("#canvas").removeLayer('TextArea_' + $rootScope.TextNumber).drawLayers();
1717   - $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();
1718   -
1719   - }
  1726 + //}
1720 1727  
1721 1728 }
1722 1729 //-- End ----------------------------
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @700f8c1
... ... @@ -510,7 +510,7 @@
510 510  
511 511 <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div>
512 512 <div class="outlinediv">
513   - <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
  513 + <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
514 514  
515 515 </div>
516 516  
... ... @@ -561,8 +561,8 @@
561 561 </div>
562 562  
563 563 <!--Modal For Annotation Text Box-->
564   - <div class="modal fade" id="annotationTextModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="z-index: 1200000!important;">
565   - <div class="modal-dialog" role="document">
  564 + <div id="annotationTextModal" style="display:none;z-index: 1000000000;width:500px;height:241px;padding-right:0!important;position:fixed;left:0;right:0;top:0px;bottom:0;margin:auto;">
  565 +
566 566 <div class="modal-content">
567 567 <div class="modal-header" style="background-color: #808D43;padding:10px;border-bottom:0;">
568 568 <!--<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>-->
... ... @@ -572,9 +572,7 @@
572 572 <div class="col-xs-12" style="padding:20px 0;">
573 573 <div class="form-inline">
574 574 <!--Annotation: Text in different font style is same.-->
575   - <select class="form-control" id="selected-font-family">
576   -
577   - </select>
  575 + <select class="form-control" id="selected-font-family"></select>
578 576 <select class="form-control" id="selected-font-size">
579 577 <option>14</option>
580 578 <option>16</option>
... ... @@ -629,11 +627,11 @@
629 627 </div>
630 628 <div class="modal-footer">
631 629 <!--<button type="button" class="btn btn-default" ng-click="closeModal()" data-dismiss="modal">Close</button>-->
632   - <button type="button" class="btn btn-default" id="closeEditText" data-dismiss="modal">Close</button>
633   - <button type="button" id="saveBtn" class="btn btn-primary" data-dismiss="modal" ng-click="saveText()">Save</button>
  630 + <button type="button" class="btn btn-default" ng-click="closeModal()" id="closeEditText" data-dismiss="modal">Close</button>
  631 + <button type="button" id="saveBtn" class="btn btn-primary" data-dismiss="modal" ng-click="saveText()">Save</button>
634 632 </div>
635 633 </div>
636   - </div>
  634 +
637 635 </div>
638 636  
639 637  
... ... @@ -1255,6 +1253,7 @@
1255 1253 $(".modal").draggable();
1256 1254 $(".annotationTollbar").draggable();
1257 1255 $(".modeleditstyle").draggable();
  1256 + $("#annotationTextModal").draggable();
1258 1257 });
1259 1258 </script>
1260 1259  
... ...