Commit b11818b48e65ac88e9e3adb2c7df3b115bc653f1
Merge branch 'cadisablebrush' into Develop
Showing
1 changed file
with
7 additions
and
4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -530,10 +530,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -530,10 +530,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
530 | // document.getElementById('modeleditstyle').style.display = "block"; | 530 | // document.getElementById('modeleditstyle').style.display = "block"; |
531 | 531 | ||
532 | } | 532 | } |
533 | - //if ($rootScope.MenuModuleName == "CA") | ||
534 | - //{ | ||
535 | - // $("#annotationpaintbrushsize").attr("href", "#"); | ||
536 | - //} | 533 | + if ($rootScope.MenuModuleName == "CA") |
534 | + { | ||
535 | + $("#annotationpaintbrushsize").attr("href", "#"); | ||
536 | + } | ||
537 | + else { | ||
538 | + $("#annotationpaintbrushsize").attr("href", "#canvasPaint"); | ||
539 | + } | ||
537 | $("#OnIdentify").addClass("annotationtoolbartab"); | 540 | $("#OnIdentify").addClass("annotationtoolbartab"); |
538 | $("#annotationToolBarOptions").addClass("active"); | 541 | $("#annotationToolBarOptions").addClass("active"); |
539 | $("#annotationButton").addClass("active"); | 542 | $("#annotationButton").addClass("active"); |