Commit e30d71ca752657e144817dd0e44ee261fdd5c8f9
1 parent
7e3fe013
this is show hide structure
Showing
3 changed files
with
67 additions
and
10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -140,6 +140,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -140,6 +140,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
140 | 140 | ||
141 | } | 141 | } |
142 | 142 | ||
143 | + | ||
143 | $scope.scroll = function () { | 144 | $scope.scroll = function () { |
144 | // $window.scrollTo(0, 0); | 145 | // $window.scrollTo(0, 0); |
145 | $("html,body").scrollTop(0); | 146 | $("html,body").scrollTop(0); |
@@ -3569,6 +3570,41 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3569,6 +3570,41 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
3569 | 3570 | ||
3570 | } | 3571 | } |
3571 | 3572 | ||
3573 | + | ||
3574 | + if (document.getElementById("btnStrutureBox").name == "showAnnotationStructure") { | ||
3575 | + $scope.showAnnotation() | ||
3576 | + | ||
3577 | + } | ||
3578 | + else { | ||
3579 | + $scope.hideAnnotation() | ||
3580 | + | ||
3581 | + | ||
3582 | + } | ||
3583 | + } | ||
3584 | + | ||
3585 | + $scope.showAnnotation = function() | ||
3586 | + { | ||
3587 | + $(".com").show(); | ||
3588 | + $('#dot').show(); | ||
3589 | + $('#bord').show(); | ||
3590 | + $('#sppeachBubble').show(); | ||
3591 | + $('#sppeachBubble_annotation').show(); | ||
3592 | + | ||
3593 | + $("#bord_annotation").show(); | ||
3594 | + $("#dot_annotation").show(); | ||
3595 | + $(".dynCross_anno").parent().parent().parent().show(); | ||
3596 | + } | ||
3597 | + | ||
3598 | + $scope.hideAnnotation=function() | ||
3599 | + { | ||
3600 | + $(".com").hide(); | ||
3601 | + $('#dot').hide(); | ||
3602 | + $('#bord').hide(); | ||
3603 | + $('#sppeachBubble').hide(); | ||
3604 | + $('#sppeachBubble_annotation').hide(); | ||
3605 | + $("#bord_annotation").hide(); | ||
3606 | + $("#dot_annotation").hide(); | ||
3607 | + $(".dynCross_anno").parent().parent().parent().hide(); | ||
3572 | } | 3608 | } |
3573 | 3609 | ||
3574 | $scope.createSpeechBubbleBasedOnAnnotationLength = function (pointClicked, x, y, id) { | 3610 | $scope.createSpeechBubbleBasedOnAnnotationLength = function (pointClicked, x, y, id) { |
@@ -5878,19 +5914,34 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -5878,19 +5914,34 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
5878 | 5914 | ||
5879 | 5915 | ||
5880 | //if listanager is visisble then close it | 5916 | //if listanager is visisble then close it |
5917 | + | ||
5881 | 5918 | ||
5882 | $rootScope.isListManagerSelected = false; | 5919 | $rootScope.isListManagerSelected = false; |
5883 | $rootScope.CloseListManager(); | 5920 | $rootScope.CloseListManager(); |
5921 | + var btnStrutureBoxname = document.getElementById("btnStrutureBox").name; | ||
5922 | + | ||
5923 | + if (btnStrutureBoxname == "showAnnotationStructure") { | ||
5924 | + $("#btnStrutureBox").addClass("disableHideShowStructure"); | ||
5925 | + $scope.hideAnnotation(); | ||
5926 | + document.getElementById("btnStrutureBox").name = "hideAnnotationStructure"; | ||
5927 | + } | ||
5928 | + else { | ||
5929 | + $("#btnStrutureBox").removeClass("disableHideShowStructure"); | ||
5930 | + $scope.showAnnotation(); | ||
5931 | + | ||
5932 | + document.getElementById("btnStrutureBox").name = "showAnnotationStructure"; | ||
5933 | + } | ||
5934 | + //$(".com").toggle(); | ||
5935 | + //$('#dot').toggle(); | ||
5936 | + //$('#bord').toggle(); | ||
5937 | + //$('#sppeachBubble').toggle(); | ||
5938 | + //$('#sppeachBubble_annotation').toggle(); | ||
5939 | + | ||
5940 | + //$("#bord_annotation").toggle(); | ||
5941 | + //$("#dot_annotation").toggle(); | ||
5942 | + //$(".dynCross_anno").parent().parent().parent().toggle(); | ||
5884 | 5943 | ||
5885 | - $(".com").toggle(); | ||
5886 | - $('#dot').toggle(); | ||
5887 | - $('#bord').toggle(); | ||
5888 | - $('#sppeachBubble').toggle(); | ||
5889 | - $('#sppeachBubble_annotation').toggle(); | ||
5890 | 5944 | ||
5891 | - $("#bord_annotation").toggle(); | ||
5892 | - $("#dot_annotation").toggle(); | ||
5893 | - $(".dynCross_anno").parent().parent().parent().toggle(); | ||
5894 | 5945 | ||
5895 | } | 5946 | } |
5896 | 5947 |
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -238,7 +238,7 @@ | @@ -238,7 +238,7 @@ | ||
238 | </div> | 238 | </div> |
239 | 239 | ||
240 | <div class="col-xs-12"> | 240 | <div class="col-xs-12"> |
241 | - <button id="btnStrutureBox" onclick="enableShowHideStructureBox()" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Show/Hide Structure Name Boxes"> <img src="content/images/comment-box.png" alt=""></button> | 241 | + <button id="btnStrutureBox" onclick="enableShowHideStructureBox()" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom" data-toggle="tooltip" data-placement="bottom" name="showAnnotationStructure" title="Show/Hide Structure Name Boxes"> <img src="content/images/comment-box.png" alt=""></button> |
242 | </div> | 242 | </div> |
243 | 243 | ||
244 | </div> | 244 | </div> |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -933,4 +933,10 @@ background-size:cover; | @@ -933,4 +933,10 @@ background-size:cover; | ||
933 | /*Bug #8679*/ | 933 | /*Bug #8679*/ |
934 | .selected { | 934 | .selected { |
935 | background-color: lightgrey; | 935 | background-color: lightgrey; |
936 | - } | ||
937 | \ No newline at end of file | 936 | \ No newline at end of file |
937 | + } | ||
938 | + | ||
939 | + .disableHideShowStructure | ||
940 | + { | ||
941 | + background:#4b4b4b !important; | ||
942 | + border-color:#3f3f3f !important; | ||
943 | + } | ||
938 | \ No newline at end of file | 944 | \ No newline at end of file |