From 0ef239377e7344bb9c151f1abefa0bcb9434699b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 12 Jan 2017 11:57:15 +0530 Subject: [PATCH] Commit changes for Bug #12596:DA > Annotation Toolbar > If Fill Option and Outline option are unchecked and user click on Cancel button. Changes should be discard. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 6 ++++-- 400-SOURCECODE/AIAHTML5.Web/index.html | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index fd51bbf..aa2487a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -562,12 +562,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", $rootScope.disableAnnotationToolBar = function () { - + + $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(255,255,255)"); + $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(0,0,0)"); document.getElementById('modelbackground').style.display = "none"; document.getElementById('modeleditstyle').style.display = "none"; //Edit Shape Style popup should open at it's default position $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" }); - + } diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index 4a5fb61..e280465 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -2,8 +2,8 @@ - - + + -- libgit2 0.21.4