Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into TransparencyBoxResizingIssue

unknown
2 parents 39c96872 499636be
Showing 1 changed file with 7 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -531,10 +531,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             // document.getElementById('modeleditstyle').style.display = "block";
         }
-        //if ($rootScope.MenuModuleName == "CA")
-        //{
-        //    $("#annotationpaintbrushsize").attr("href", "#");
-        //}
+        if ($rootScope.MenuModuleName == "CA")
+        {
+            $("#annotationpaintbrushsize").attr("href", "#");
+        }
+        else {
+            $("#annotationpaintbrushsize").attr("href", "#canvasPaint");
+        }
         $("#OnIdentify").addClass("annotationtoolbartab");
         $("#annotationToolBarOptions").addClass("active");
         $("#annotationButton").addClass("active");