ADAM / AIAHTML5

Commit a7c547078cf172a34ff3a2d6462b20af05051014

Authored by Amrita Vishnoi
2 parents 41f627f1 c8b893bf

Merge branch 'activeIssueInAALeftToolbar' into Develop

Inline Side-by-side
Showing 1 changed file with 12 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @a7c5470
... ... @@ -399,9 +399,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
399 399 $scope.allPinDataArray.push(value._PinId);
400 400 $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY)
401 401 })
402   -
403   -
404   -
405 402 //load search/vocab data
406 403 $rootScope.loadSearchData();
407 404 }
... ... @@ -1435,6 +1432,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1435 1432 $(".tooltip-custom").removeClass("btn-primary");
1436 1433 $(".tooltip-custom").addClass("btn-black");
1437 1434 $("#hidePinBtn").addClass("btn-primary");
  1435 + $("#hidePinBtn").removeClass("btn-black");
1438 1436 }
1439 1437  
1440 1438 $scope.showAllPinsAfterHide = function (event) {
... ... @@ -1457,6 +1455,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1457 1455 $(".tooltip-custom").removeClass("btn-primary");
1458 1456 $(".tooltip-custom").addClass("btn-black");
1459 1457 $("#allPinBtn").addClass("btn-primary");
  1458 + $("#allPinBtn").removeClass("btn-black");
1460 1459 if ($scope.isSliderChange == true) {
1461 1460 $scope.isSliderChange = false;
1462 1461 $scope.showAllPins();
... ... @@ -1486,6 +1485,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1486 1485 $(".tooltip-custom").removeClass("btn-primary");
1487 1486 $(".tooltip-custom").addClass("btn-black");
1488 1487 $("#selectedPin").addClass("btn-primary");
  1488 + $("#selectedPin").removeClass("btn-black");
1489 1489  
1490 1490 if ($scope.isSelectedPinBtnClickedAftrSliderCange == true) {
1491 1491  
... ... @@ -1659,6 +1659,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1659 1659 var speechBubbleLineDispProp = $("#speechBubbleLine" + sppechBubbleId).css("display");
1660 1660 var speechBubbleLineID = "speechBubbleLine" + sppechBubbleId;
1661 1661 var speechBubbleDraggedLineID = "speechBubbleDraggedLine" + sppechBubbleId;
  1662 + $("#comment-box").addClass("btn-primary");
  1663 + $("#comment-box").removeClass("btn-black");
  1664 +
1662 1665 if (speechBubbleLineDispProp == "block") {
1663 1666 $rootScope.annotationArray.push({ "speechBuubleId": speechBubbleID, "speechBubbleLineId": speechBubbleLineID });
1664 1667 }
... ... @@ -1671,6 +1674,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1671 1674 $("#" + $rootScope.annotationArray[i].speechBuubleId).css("display", "none");
1672 1675 $("#" + $rootScope.annotationArray[i].speechBubbleLineId).css("display", "none");
1673 1676 }
  1677 +
1674 1678 }
1675 1679 else {
1676 1680 $rootScope.isShowHideButtonClicked = true;
... ... @@ -1678,7 +1682,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1678 1682 $("#" + $rootScope.annotationArray[i].speechBuubleId).css("display", "block");
1679 1683 $("#" + $rootScope.annotationArray[i].speechBubbleLineId).css("display", "block");
1680 1684 }
  1685 +
  1686 + $("#comment-box").removeClass("btn-primary");
  1687 + $("#comment-box").addClass("btn-black");
  1688 +
1681 1689 }
  1690 +
1682 1691 }
1683 1692 $scope.activePinOnLayerChange = function () {
1684 1693  
... ...