ADAM / AIAHTML5

Commit e4145099eb1eda94facf0c7a478d44c0b22c93c9

Authored by Nikita Kulshreshtha
2 parents 46c5a81f 6c02d988

auto merge caused conflits

Inline Side-by-side
Showing 2 changed files with 56 additions and 0 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @e414509
... ... @@ -745,6 +745,35 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
745 745 $(".marginTopBtm10 div.outlinediv").css("opacity", 1);
746 746 //$("#borderWidthCanvasElement").change(function () {
747 747 // $(".marginTopBtm10 div.outlinediv").css("border-color", x);
  748 + document.getElementById("editStyleForm").reset();
  749 + var isOutlineOptionChecked = document.getElementById('Outline-Option').checked;
  750 + var isfilloptionChecked = document.getElementById('fill-option').checked
  751 +
  752 + if (isOutlineOptionChecked == true) {
  753 + $(".setEnableDisableForEditShapeStyle").css({ "opacity": "1" });
  754 + $("#borderWidthCanvasElement").css({ "pointer-events": "auto" });
  755 + $("#outlineColor").css({ "pointer-events": "auto" });
  756 + }
  757 + else {
  758 + $(".setEnableDisableForEditShapeStyle").css({ "opacity": ".5" });
  759 + $("#borderWidthCanvasElement").css({ "pointer-events": "none" });
  760 + $("#outlineColor").css({ "pointer-events": "none" });
  761 + }
  762 + if (isfilloptionChecked == true) {
  763 + $(".enableDisableOpacity label").css({ "cursor": "pointer" });
  764 + $(".enableDisableOpacity").css({ "opacity": "1" });
  765 + $("#edit-slider-3").css({ "pointer-events": "auto" });
  766 + $("#edit-slider-4").css({ "pointer-events": "auto" });
  767 + $("#editstylebackgroundcolor").css({ "pointer-events": "auto" });
  768 + }
  769 + else {
  770 +
  771 + $(".enableDisableOpacity label").css({ "cursor": "pointer" });
  772 + $(".enableDisableOpacity").css({ "opacity": ".5" });
  773 + $("#edit-slider-3").css({ "pointer-events": "none" });
  774 + $("#edit-slider-4").css({ "pointer-events": "none" });
  775 + $("#editstylebackgroundcolor").css({ "pointer-events": "none" });
  776 + }
748 777 //});
749 778 } else {
750 779 var previewBgColor = $("#shapeStyleDiv").css('background-color');
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @e414509
... ... @@ -842,11 +842,20 @@
842 842 <!--Edit Shape Modal-->
843 843  
844 844  
  845 +<<<<<<< HEAD
845 846 <div class="modeleditstyle" id="modeleditstyle" style="z-index: 1000000000; background: white;width: 302px;position:absolute;left:40%;right:0;top:70px;">
846 847 <div class="modal-content">
847 848 <div class="modal-header annotation-modal-header">
848 849 <h4 class="modal-title" id="myModalLabel33">Edit Shape Style</h4>
849 850 </div>
  851 +=======
  852 + <div class="modeleditstyle" id="modeleditstyle" style="z-index: 1000000000; background: white;width: 302px;position:absolute;left:40%;right:0;top:70px;">
  853 + <div class="modal-content">
  854 + <div class="modal-header annotation-modal-header">
  855 + <h4 class="modal-title" id="myModalLabel33">Edit Shape Style</h4>
  856 + </div>
  857 + <form id="editStyleForm">
  858 +>>>>>>> uncheckedoutlineoption
850 859 <div class="modal-body">
851 860 <div class="marginTopBtm10">
852 861 <div class="well well-sm no-margin-btm">
... ... @@ -860,12 +869,21 @@
860 869 </div>
861 870 <div class="col-sm-6 enableDisableOpacity">
862 871 <!--<div class="radio">
  872 +<<<<<<< HEAD
863 873 <label>
864 874 <input type="radio" name="filloption" id="filloption1" value="filloption1">
865 875 <span class="">Texture</span>
866 876 <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
867 877 </label>
868 878 </div>-->
  879 +=======
  880 + <label>
  881 + <input type="radio" name="filloption" id="filloption1" value="filloption1">
  882 + <span class="">Texture</span>
  883 + <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
  884 + </label>
  885 + </div>-->
  886 +>>>>>>> uncheckedoutlineoption
869 887 <div class="radio">
870 888 <label>
871 889 <input type="radio" name="filloption" id="filloption2" value="filloption2" checked style="margin-top:8px;">
... ... @@ -957,14 +975,23 @@
957 975  
958 976 </div>
959 977 </div>
  978 +<<<<<<< HEAD
  979 +=======
  980 + </form>
  981 +>>>>>>> uncheckedoutlineoption
960 982 <div class="modal-footer">
961 983 <button id="btnShapeStyle" type="button" class="btn btn-primary btn-sm" ng-click="setPropertiesForShapes('imgOpacity')">
962 984 OK
963 985 </button>
964 986 <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
965 987 </div>
  988 +<<<<<<< HEAD
966 989 </div>
967 990 </div>
  991 +=======
  992 +</div>
  993 + </div>
  994 +>>>>>>> uncheckedoutlineoption
968 995  
969 996 <!--Export Image Modal-->
970 997 <div class="modal fade export-image ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="display: none;">
... ...