ADAM / AIAHTML5

Commit a57d7b6598288aa923eeddb2fc1b4924c88d59a4

Authored by Amrita Vishnoi
2 parents 2ef28470 900c353c

Merge branch 'RemovedAddEventLitsnersForFreeze' into Develop

Inline Side-by-side
Showing 2 changed files with 40 additions and 14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @a57d7b6
... ... @@ -1003,15 +1003,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1003 1003  
1004 1004 $('#draggable').css('width', dragdivw);
1005 1005 $('#draggable').css('height', dragdivh)
1006   -
1007   - // document.getElementById('btnTranparency').addEventListener('click', $scope.createTransparencyBox);
1008   - document.getElementById('btnNormalMode').addEventListener('click', $scope.enableNormalMode);
1009   - document.getElementById('btnExtract').addEventListener('click', $scope.enableExtract);
1010   - document.getElementById('btnHighLight').addEventListener('click', $scope.enableHighlight);
1011   - document.getElementById('btnIdentity').addEventListener('click', $scope.OnIdentityClick);
1012   - document.getElementById('btnZoom').addEventListener('click', $scope.enableZoom);
1013   - //document.getElementById('btnTBoxClose').addEventListener('click', $scope.CloseTransparencyBox);
1014   -
  1006 +
1015 1007 }
1016 1008  
1017 1009 function scaleRectangle(x, y, height, width, mirrorValue) {
... ... @@ -4692,7 +4684,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4692 4684 };
4693 4685  
4694 4686  
4695   - $scope.OnIdentityClick = function () {
  4687 + $scope.IdentityClick = function () {
4696 4688  
4697 4689  
4698 4690 //if listanager is visisble then close it
... ... @@ -7980,3 +7972,37 @@ function onTboxClose()
7980 7972 scope.CloseTransparencyBox();
7981 7973 });
7982 7974 }
  7975 +
  7976 +function OnEnableNormalMode()
  7977 +{
  7978 + console.log('OnEnableNormalMode is called outside ');
  7979 + var scope = angular.element(document.getElementById("daView")).scope();
  7980 + scope.$apply(function () {
  7981 + scope.enableNormalMode();
  7982 + });
  7983 +}
  7984 +
  7985 +function OnEnableHighlight() {
  7986 + console.log('OnEnableHighlight is called outside ');
  7987 + var scope = angular.element(document.getElementById("daView")).scope();
  7988 + scope.$apply(function () {
  7989 + scope.enableHighlight();
  7990 + });
  7991 +}
  7992 +
  7993 +function OnIdentityClick() {
  7994 + console.log('OnIdentityClick is called outside ');
  7995 + var scope = angular.element(document.getElementById("daView")).scope();
  7996 + scope.$apply(function () {
  7997 + scope.IdentityClick();
  7998 + });
  7999 +}
  8000 +
  8001 +function OnZoom()
  8002 +{
  8003 + console.log('OnZoom is called outside ');
  8004 + var scope = angular.element(document.getElementById("daView")).scope();
  8005 + scope.$apply(function () {
  8006 + scope.enableZoom();
  8007 + });
  8008 +}
7983 8009 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @a57d7b6
... ... @@ -143,10 +143,10 @@
143 143 <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;"></div>
144 144 <div class="" style="top:20px">
145 145 <div class="col-sm-6">
146   - <button id="btnIdentity" class="btn btn-primary btn-sm tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Identify"> <img src="content/images/icon-identity.png" alt=""></button>
  146 + <button id="btnIdentity" onclick="OnIdentityClick()" class="btn btn-primary btn-sm tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Identify"> <img src="content/images/icon-identity.png" alt=""></button>
147 147 </div>
148 148 <div class="col-sm-6 pull-right">
149   - <button class="btn btn-black btn-sm pull-right tooltip-custom" id="btnZoom" data-toggle="tooltip" data-placement="bottom" title="Zoom-in/Zoom-out">
  149 + <button class="btn btn-black btn-sm pull-right tooltip-custom" onclick="OnZoom()" id="btnZoom" data-toggle="tooltip" data-placement="bottom" title="Zoom-in/Zoom-out">
150 150 <img src="content/images/icon-zoom.png" alt="">
151 151 </button>
152 152  
... ... @@ -157,14 +157,14 @@
157 157  
158 158  
159 159 <div class="col-sm-6">
160   - <button id="btnNormalMode" class="btn btn-primary btn-sm marginTop5 tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Normal"> <img src="content/images/bulb1.png" alt=""></button>
  160 + <button id="btnNormalMode" class="btn btn-primary btn-sm marginTop5 tooltip-custom" onclick="OnEnableNormalMode()" data-toggle="tooltip" data-placement="bottom" title="Normal"> <img src="content/images/bulb1.png" alt=""></button>
161 161 </div>
162 162 <div class="col-sm-6">
163 163 <button id="btnExtract" class="btn btn-black btn-sm pull-right marginTop5 tooltip-custom" onclick="OnEnableExtract()" data-toggle="tooltip" data-placement="bottom" title="Extract"><img src="content/images/bulb1.png" alt=""></button>
164 164 </div>
165 165  
166 166 <div class="col-sm-6">
167   - <button id="btnHighLight" class="btn btn-black btn-sm marginTop5 tooltip-custom btn-resize" data-toggle="tooltip" data-placement="bottom" title="Highlight"> <img src="content/images/bulb.png" alt=""></button>
  167 + <button id="btnHighLight" class="btn btn-black btn-sm marginTop5 tooltip-custom btn-resize" onclick="OnEnableHighlight()" data-toggle="tooltip" data-placement="bottom" title="Highlight"> <img src="content/images/bulb.png" alt=""></button>
168 168 </div>
169 169  
170 170 <div class="col-sm-6 dropdown hover-tool">
... ...