Commit 35695cde7dd7d961a1490a1801fdfbd25a5304bd
1 parent
414afdff
this is for ie outline with color and size annotation image
Showing
2 changed files
with
12 additions
and
6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... | ... | @@ -470,9 +470,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", |
470 | 470 | $rootScope.shapestyleFillColor = $("#" + id).css('background-color'); |
471 | 471 | $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor); |
472 | 472 | $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color"); |
473 | - $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor); | |
473 | + // $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor); | |
474 | 474 | $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width"); |
475 | - $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel); | |
475 | + | |
476 | + document.getElementById("shapeStyleDiv").parentNode.style.border = $rootScope.shapestyleborderWidthSeparatingPixel + " " + "solid" + " " + $rootScope.shapestyleborderColor; | |
477 | + | |
478 | + // $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel); | |
476 | 479 | var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel; |
477 | 480 | var intPart = pixelSeparation.split("p"); |
478 | 481 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/index.html
... | ... | @@ -1432,11 +1432,13 @@ |
1432 | 1432 | borderWidth = $(this).val(); |
1433 | 1433 | |
1434 | 1434 | if (borderColor != null) { |
1435 | - | |
1436 | - $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor); | |
1435 | + document.getElementById("imgOpacity").parentNode.style.border = borderWidth + "px" + " " + "solid" + " " + borderColor; | |
1436 | + //$("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor); | |
1437 | 1437 | } else { |
1438 | 1438 | |
1439 | - $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid"); | |
1439 | + // $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid"); | |
1440 | + document.getElementById("imgOpacity").parentNode.style.border = borderWidth + "px" + " " + "solid" + " " + borderColor; | |
1441 | + | |
1440 | 1442 | } |
1441 | 1443 | }); |
1442 | 1444 | |
... | ... | @@ -1461,7 +1463,8 @@ |
1461 | 1463 | console.log(value); |
1462 | 1464 | |
1463 | 1465 | borderColor = value; |
1464 | - $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor); | |
1466 | + //$("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor); | |
1467 | + document.getElementById("imgOpacity").parentNode.style.border = borderWidth + "px" + " " + "solid" + " " + borderColor; | |
1465 | 1468 | |
1466 | 1469 | |
1467 | 1470 | } | ... | ... |