Commit 6f8c40196adf9a91aa9c1ad7a57bb9cbb84984d5
Fixed Line issue in IE
Showing
2 changed files
with
13 additions
and
7 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| @@ -472,9 +472,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | @@ -472,9 +472,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | ||
| 472 | $rootScope.shapestyleFillColor = $("#" + id).css('background-color'); | 472 | $rootScope.shapestyleFillColor = $("#" + id).css('background-color'); |
| 473 | $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor); | 473 | $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor); |
| 474 | $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color"); | 474 | $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color"); |
| 475 | - $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor); | 475 | + // $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor); |
| 476 | $rootScope.borderDimensions = $("#" + id).parent().css("border-top-width"); | 476 | $rootScope.borderDimensions = $("#" + id).parent().css("border-top-width"); |
| 477 | - $("#shapeStyleDiv").parent().css("border-width", $rootScope.borderDimensions); | 477 | + |
| 478 | + document.getElementById("shapeStyleDiv").parentNode.style.border = $rootScope.borderDimensions + " " + "solid" + " " + $rootScope.shapestyleborderColor; | ||
| 479 | + | ||
| 480 | + // $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel); | ||
| 478 | 481 | ||
| 479 | var borderDimensions = $rootScope.borderDimensions; | 482 | var borderDimensions = $rootScope.borderDimensions; |
| 480 | var borderDimensionSplitArray = borderDimensions.split("p"); | 483 | var borderDimensionSplitArray = borderDimensions.split("p"); |
400-SOURCECODE/AIAHTML5.Web/index.html
| @@ -886,7 +886,7 @@ | @@ -886,7 +886,7 @@ | ||
| 886 | </div> | 886 | </div> |
| 887 | </div> | 887 | </div> |
| 888 | <div class="modal-footer"> | 888 | <div class="modal-footer"> |
| 889 | - <button id="btnShapeStyle" type="button" class="btn btn-primary btn-sm" ng-click="shapestyle('imgOpacity')"> | 889 | + <button id="btnShapeStyle" type="button" class="btn btn-primary btn-sm" ng-click="setPropertiesForShapes('imgOpacity')"> |
| 890 | OK | 890 | OK |
| 891 | </button> | 891 | </button> |
| 892 | <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button> | 892 | <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button> |
| @@ -1435,11 +1435,13 @@ | @@ -1435,11 +1435,13 @@ | ||
| 1435 | borderWidth = $(this).val(); | 1435 | borderWidth = $(this).val(); |
| 1436 | 1436 | ||
| 1437 | if (borderColor != null) { | 1437 | if (borderColor != null) { |
| 1438 | - | ||
| 1439 | - $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor); | 1438 | + document.getElementById("imgOpacity").parentNode.style.border = borderWidth + "px" + " " + "solid" + " " + borderColor; |
| 1439 | + //$("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor); | ||
| 1440 | } else { | 1440 | } else { |
| 1441 | 1441 | ||
| 1442 | - $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid"); | 1442 | + // $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid"); |
| 1443 | + document.getElementById("imgOpacity").parentNode.style.border = borderWidth + "px" + " " + "solid" + " " + borderColor; | ||
| 1444 | + | ||
| 1443 | } | 1445 | } |
| 1444 | }); | 1446 | }); |
| 1445 | 1447 | ||
| @@ -1464,7 +1466,8 @@ | @@ -1464,7 +1466,8 @@ | ||
| 1464 | console.log(value); | 1466 | console.log(value); |
| 1465 | 1467 | ||
| 1466 | borderColor = value; | 1468 | borderColor = value; |
| 1467 | - $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor); | 1469 | + //$("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor); |
| 1470 | + document.getElementById("imgOpacity").parentNode.style.border = borderWidth + "px" + " " + "solid" + " " + borderColor; | ||
| 1468 | 1471 | ||
| 1469 | 1472 | ||
| 1470 | } | 1473 | } |