ADAM / AIAHTML5

Commit e5fea54ef4da728f20cd38db066cf3654d5cd211

Authored by unknown
2 parents f4b38866 5fc7c2b4

Merge branch 'DisableATBarOnPopUp' of http://52.6.196.163/ADAM/AIAHTML5 into Annotation_Pencil

Inline Side-by-side
Showing 4 changed files with 5 additions and 7 deletions
400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj
  View file @e5fea54
... ... @@ -73,7 +73,6 @@
73 73 </ItemGroup>
74 74 <ItemGroup>
75 75 <Content Include="Global.asax" />
76   - <Content Include="term-number-wp%282%29.js" />
77 76 <Content Include="Web.config" />
78 77 </ItemGroup>
79 78 <ItemGroup>
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @e5fea54
... ... @@ -6961,12 +6961,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6961 6961 //8.remove current layer canavses
6962 6962 $scope.flushCanvas();
6963 6963  
  6964 +
6964 6965  
6965 6966 //9.
6966 6967 $timeout(function () {
6967 6968 $rootScope.isHighLight = false;
6968   -
6969   - //removing speechbubble
6970 6969 $('#sppeachBubble').css('display', 'none');
6971 6970 $("#dot").css("display", "none");
6972 6971  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @e5fea54
... ... @@ -319,14 +319,14 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
319 319  
320 320 }
321 321  
322   - $rootScope.backOpacity = function () {
  322 + $rootScope.enableAnnotationToolBar = function () {
323 323  
324 324 document.getElementById('modelbackground').style.display = "block";
325 325 $("#editshapestyle").modal('show');
326 326  
327 327 }
328 328  
329   - $rootScope.closeBackOpacity = function () {
  329 + $rootScope.disableAnnotationToolBar = function () {
330 330  
331 331 document.getElementById('modelbackground').style.display = "none";
332 332  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @e5fea54
... ... @@ -423,7 +423,7 @@
423 423 </div>
424 424 </div>
425 425 <div class="well-popup well">
426   - <img src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="backOpacity()">
  426 + <img src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="enableAnnotationToolBar()">
427 427 </div>
428 428 <div class="well well-popup">
429 429 <div class="" role="group" aria-label="...">
... ... @@ -785,7 +785,7 @@
785 785 <button type="button" class="btn btn-primary btn-sm" ng-click="shapestyle('imgOpacity')">
786 786 OK
787 787 </button>
788   - <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="closeBackOpacity()">Cancel</button>
  788 + <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
789 789 </div>
790 790 </div>
791 791 </div>
... ...