auto merge caused conflits

Nikita Kulshreshtha
2 parents 46c5a81f 6c02d988
Showing 2 changed files with 56 additions and 0 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -745,6 +745,35 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 $(".marginTopBtm10 div.outlinediv").css("opacity", 1);
                 //$("#borderWidthCanvasElement").change(function () {
                 //    $(".marginTopBtm10 div.outlinediv").css("border-color", x);
+                document.getElementById("editStyleForm").reset();
+                var isOutlineOptionChecked = document.getElementById('Outline-Option').checked;
+                var isfilloptionChecked = document.getElementById('fill-option').checked
+
+                if (isOutlineOptionChecked == true) {
+                    $(".setEnableDisableForEditShapeStyle").css({ "opacity": "1" });
+                    $("#borderWidthCanvasElement").css({ "pointer-events": "auto" });
+                    $("#outlineColor").css({ "pointer-events": "auto" });
+                }
+                else {
+                    $(".setEnableDisableForEditShapeStyle").css({ "opacity": ".5" });
+                    $("#borderWidthCanvasElement").css({ "pointer-events": "none" });
+                    $("#outlineColor").css({ "pointer-events": "none" });
+                }
+                if (isfilloptionChecked == true) {
+                    $(".enableDisableOpacity label").css({ "cursor": "pointer" });
+                    $(".enableDisableOpacity").css({ "opacity": "1" });
+                    $("#edit-slider-3").css({ "pointer-events": "auto" });
+                    $("#edit-slider-4").css({ "pointer-events": "auto" });
+                    $("#editstylebackgroundcolor").css({ "pointer-events": "auto" });
+                }
+                else {
+
+                    $(".enableDisableOpacity label").css({ "cursor": "pointer" });
+                    $(".enableDisableOpacity").css({ "opacity": ".5" });
+                    $("#edit-slider-3").css({ "pointer-events": "none" });
+                    $("#edit-slider-4").css({ "pointer-events": "none" });
+                    $("#editstylebackgroundcolor").css({ "pointer-events": "none" });
+                }
                 //});
             } else {
                 var previewBgColor = $("#shapeStyleDiv").css('background-color');
@@ -842,11 +842,20 @@
             <!--Edit Shape Modal-->
+<<<<<<< HEAD
             <div class="modeleditstyle" id="modeleditstyle" style="z-index: 1000000000; background: white;width: 302px;position:absolute;left:40%;right:0;top:70px;">
                 <div class="modal-content">
                     <div class="modal-header annotation-modal-header">
                         <h4 class="modal-title" id="myModalLabel33">Edit Shape Style</h4>
                     </div>
+=======
+    <div class="modeleditstyle" id="modeleditstyle" style="z-index: 1000000000; background: white;width: 302px;position:absolute;left:40%;right:0;top:70px;">
+            <div class="modal-content">
+                <div class="modal-header annotation-modal-header">
+                    <h4 class="modal-title" id="myModalLabel33">Edit Shape Style</h4>
+                </div>
+                <form id="editStyleForm">
+>>>>>>> uncheckedoutlineoption
                     <div class="modal-body">
                         <div class="marginTopBtm10">
                             <div class="well well-sm no-margin-btm">
@@ -860,12 +869,21 @@
                                     </div>
                                     <div class="col-sm-6 enableDisableOpacity">
                                         <!--<div class="radio">
+<<<<<<< HEAD
                                             <label>
                                                 <input type="radio" name="filloption" id="filloption1" value="filloption1">
                                                 <span class="">Texture</span>
                                                 <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
                                             </label>
                                     </div>-->
+=======
+                                    <label>
+                                        <input type="radio" name="filloption" id="filloption1" value="filloption1">
+                                        <span class="">Texture</span>
+                                        <img id="editstyleTexture" src="~/../content/images/common/annotation-tool-bar/pattern-picker.png" alt="" class="pattern-picker" data-toggle="modal" data-target="#pattern">
+                                    </label>
+                            </div>-->
+>>>>>>> uncheckedoutlineoption
                                         <div class="radio">
                                             <label>
                                                 <input type="radio" name="filloption" id="filloption2" value="filloption2" checked style="margin-top:8px;">
@@ -957,14 +975,23 @@
                         </div>
                     </div>
+<<<<<<< HEAD
+=======
+                </form>
+>>>>>>> uncheckedoutlineoption
                     <div class="modal-footer">
                         <button id="btnShapeStyle" type="button" class="btn btn-primary btn-sm" ng-click="setPropertiesForShapes('imgOpacity')">
                             OK
                         </button>
                         <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
                     </div>
+<<<<<<< HEAD
                 </div>
             </div>
+=======
+</div>
+        </div>
+>>>>>>> uncheckedoutlineoption
             <!--Export Image Modal-->
             <div class="modal fade export-image ui-draggable in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="display: none;">