ADAM / AIAHTML5

Commit 0ef239377e7344bb9c151f1abefa0bcb9434699b

Authored by unknown
1 parent d4459de8

Commit changes for Bug #12596:DA > Annotation Toolbar > If Fill Option and Outli… 

…ne option are unchecked and user click on Cancel button. Changes should be discard.
Inline Side-by-side
Showing 2 changed files with 6 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @0ef2393
@@ -562,12 +562,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -562,12 +562,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
562 562
563 563
564 $rootScope.disableAnnotationToolBar = function () { 564 $rootScope.disableAnnotationToolBar = function () {
565 - 565 +
  566 + $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(255,255,255)");
  567 + $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(0,0,0)");
566 document.getElementById('modelbackground').style.display = "none"; 568 document.getElementById('modelbackground').style.display = "none";
567 document.getElementById('modeleditstyle').style.display = "none"; 569 document.getElementById('modeleditstyle').style.display = "none";
568 //Edit Shape Style popup should open at it's default position 570 //Edit Shape Style popup should open at it's default position
569 $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" }); 571 $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" });
570 - 572 +
571 573
572 } 574 }
573 575
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @0ef2393
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <html lang="en" ng-cloak ng-app="AIA"> 2 <html lang="en" ng-cloak ng-app="AIA">
3 <head> 3 <head>
4 <!--<base href="/AIAHTML5/" />--> 4 <!--<base href="/AIAHTML5/" />-->
5 - <!--<base href="/AIA/" />-->  
6 - <base href="/" /> 5 + <base href="/AIA/" />
  6 + <!--<base href="/" />-->
7 <meta charset="utf-8"> 7 <meta charset="utf-8">
8 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 8 <meta http-equiv="X-UA-Compatible" content="IE=edge">
9 <!--<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">--> 9 <!--<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">-->