ADAM / AIAHTML5

Commit 0a82cb9d0e622c5ce95b163803fd4ac8b9c07f61

Authored by Amrita Vishnoi
2 parents ecf4a65a 7481a032

Merge branch 'erasedFunctionalityIssue' into Develop

Inline Side-by-side
Showing 2 changed files with 13 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @0a82cb9
@@ -411,15 +411,25 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -411,15 +411,25 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
411 if (($location.url() == "/da-body-view")) { 411 if (($location.url() == "/da-body-view")) {
412 $rootScope.disableMenuannotation = " "; 412 $rootScope.disableMenuannotation = " ";
413 $rootScope.disableMenuoption = " "; 413 $rootScope.disableMenuoption = " ";
  414 + $("#annotationToolBarOptions").removeClass("disableSubMenu");
414 415
415 } 416 }
416 - else if (($location.url() == "/clinical-illustrations-detail") || ($location.url() == "/clinical-animations-detail")) { 417 + else if ($location.url() == "/clinical-illustrations-detail")
  418 + {
417 $rootScope.disableMenuannotation = " "; 419 $rootScope.disableMenuannotation = " ";
418 $rootScope.disableMenuoption = " "; 420 $rootScope.disableMenuoption = " ";
419 $rootScope.disableSubMenu = "disableSubMenu"; 421 $rootScope.disableSubMenu = "disableSubMenu";
  422 + $("#annotationToolBarOptions").removeClass("disableSubMenu");
  423 + }
  424 + else if($location.url() == "/clinical-animations-detail")
  425 + {
  426 + $rootScope.disableMenuannotation = "disableMenuannotation";
  427 + $rootScope.disableMenuoption = " ";
  428 + $rootScope.disableSubMenu = "disableSubMenu";
  429 + $("#annotationToolBarOptions").addClass("disableSubMenu");
420 } 430 }
421 else { 431 else {
422 - 432 + $("#annotationToolBarOptions").removeClass("disableSubMenu");
423 $rootScope.disableMenuannotation = "disableMenuannotation"; 433 $rootScope.disableMenuannotation = "disableMenuannotation";
424 $rootScope.disableMenuoption = "disableMenuoption"; 434 $rootScope.disableMenuoption = "disableMenuoption";
425 $rootScope.disableSubMenu = ""; 435 $rootScope.disableSubMenu = "";
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @0a82cb9
@@ -1361,7 +1361,7 @@ @@ -1361,7 +1361,7 @@
1361 $("#slider-range-min-2").slider("value", parseInt(brushSizevalue)); 1361 $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
1362 }); 1362 });
1363 $("#btnBrushSizeIncrement").click(function () { 1363 $("#btnBrushSizeIncrement").click(function () {
1364 - abc(); 1364 + onBrushSizeChange();
1365 var brushIncrementVar = $("#btnBrushSize").val(); 1365 var brushIncrementVar = $("#btnBrushSize").val();
1366 if (brushIncrementVar >= 60) { 1366 if (brushIncrementVar >= 60) {
1367 $("#slider-range-min-2").slider("value", 60); 1367 $("#slider-range-min-2").slider("value", 60);