From 35695cde7dd7d961a1490a1801fdfbd25a5304bd Mon Sep 17 00:00:00 2001 From: Mukul Date: Wed, 21 Dec 2016 15:54:13 +0530 Subject: [PATCH] this is for ie outline with color and size annotation image --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 7 +++++-- 400-SOURCECODE/AIAHTML5.Web/index.html | 11 +++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 4016108..9ccaae2 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -470,9 +470,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", $rootScope.shapestyleFillColor = $("#" + id).css('background-color'); $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor); $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color"); - $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor); + // $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor); $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width"); - $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel); + + document.getElementById("shapeStyleDiv").parentNode.style.border = $rootScope.shapestyleborderWidthSeparatingPixel + " " + "solid" + " " + $rootScope.shapestyleborderColor; + + // $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel); var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel; var intPart = pixelSeparation.split("p"); diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index 8039ba1..9f67eeb 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -1432,11 +1432,13 @@ borderWidth = $(this).val(); if (borderColor != null) { - - $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor); + document.getElementById("imgOpacity").parentNode.style.border = borderWidth + "px" + " " + "solid" + " " + borderColor; + //$("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor); } else { - $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid"); + // $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid"); + document.getElementById("imgOpacity").parentNode.style.border = borderWidth + "px" + " " + "solid" + " " + borderColor; + } }); @@ -1461,7 +1463,8 @@ console.log(value); borderColor = value; - $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor); + //$("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor); + document.getElementById("imgOpacity").parentNode.style.border = borderWidth + "px" + " " + "solid" + " " + borderColor; } -- libgit2 0.21.4