ADAM / AIAHTML5

Commit b75d4b2c9ad23f0967336d101e3f83e6595e420e

Authored by Nikita Kulshreshtha
2 parents 9719344d f453fb7b

Merge branch 'Develop' into QA

Inline Side-by-side
Showing 3 changed files with 19 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @b75d4b2
... ... @@ -2448,6 +2448,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2448 2448  
2449 2449 // $timeout(function () { $scope.DisableProgressBar() }, 1000);
2450 2450  
  2451 +
2451 2452  
2452 2453  
2453 2454 };
... ... @@ -2710,6 +2711,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2710 2711  
2711 2712 }
2712 2713 }
  2714 + $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2);
  2715 +
2713 2716  
2714 2717 };
2715 2718 worker.onerror = function (e) {
... ... @@ -5983,7 +5986,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5983 5986 }
5984 5987  
5985 5988 $scope.enableZoom = function () {
5986   -
  5989 + $(".annotationTollbar").css("display", "none");
  5990 + $("#annotationButton").removeClass("active");
5987 5991 $("#btnExtract").removeClass("disabled");
5988 5992 $("#btnTranparency").removeClass("disabled");
5989 5993 $rootScope.isTransparencyBoxActivated = false;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @b75d4b2
1 1 'use strict';
2 2  
3 3 AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout", "DataService", "AuthenticationService", "LoginConstants", "UserModules", "LoginMessageConstants", "AdminService", "$http", "AdminConstants", "UserTypeConstants",
4   -function ($rootScope, Modules, $log, $location, $timeout, DataService, AuthenticationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, AdminConstants, UserTypeConstants, $http) {
  4 +function ($rootScope, Modules, $log, $location, $timeout, DataService, AuthenticationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, $http, AdminConstants, UserTypeConstants) {
5 5  
6 6 //$scope.pageToOpen = {
7 7 // name: 'MainMenu'
... ... @@ -565,6 +565,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
565 565 $('#daImagePanel').remove();
566 566 if ($('#jsPanel-1').length > 0)
567 567 $('#jsPanel-1').remove();
  568 +
  569 + if ($('#3DImagePanel').length > 0)
  570 + $('#3DImagePanel').remove();
  571 +
  572 + if ($('#ciImagePanel').length > 0)
  573 + $('#ciImagePanel').remove();
  574 +
  575 + if ($('#caVideoPanel').length > 0)
  576 + $('#caVideoPanel').remove();
  577 +
568 578 $location.url('/' + slug);
569 579  
570 580 $rootScope.$broadcast('jsPanelCloseEvent', true);
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @b75d4b2
... ... @@ -1046,7 +1046,7 @@
1046 1046 <div class="modal-footer">
1047 1047 <div class="row">
1048 1048 <input type="file" id="file1" style="display:none">
1049   - <!--<a href="data:application/xml;charset=utf-8,your code here" download="filename.html">Save</a-->>
  1049 + <!--<a href="data:application/xml;charset=utf-8,your code here" download="filename.html">Save</a-->
1050 1050 <div class="col-sm-12"><button id="btnSaveEI" class="btn btn-primary" type="button">Ok</button></div> <!--onclick="makeScreenshot();"--><!--ng-click="dialogs.saveAs()"--><!--ng-click="ShowAlert()"-->
1051 1051 </div>
1052 1052 </div>
... ... @@ -1216,10 +1216,10 @@
1216 1216 </div>
1217 1217  
1218 1218 <!--Available modules list modal after login-->
1219   - <div class="modal fade ui-draggable in" id="dvUserModulesInfo" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="padding-left: 17px; display: none; left: 0px !important; z-index: 111111;">
  1219 + <div class=" fade ui-draggable in" id="dvUserModulesInfo" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="padding-left: 17px; display: none; left: 0px !important; z-index: 111111; position: fixed; top: 0; overflow-x: hidden; overflow-y: auto; right: 0px; bottom: 0px; ">
1220 1220 <div class="modal-dialog" role="document">
1221 1221 <div class="modal-content">
1222   - <div class="modal-header ui-draggable-handle " style="color: #ffffff; background-color: #0095da; border-color: #007ab3;">
  1222 + <div class="modal-header ui-draggable-handle " style="color: #ffffff; background-color: #0095da; border-color: #007ab3;cursor:default;">
1223 1223 <!--color: #e5e5e5;-->
1224 1224 <!--bg-primary-->
1225 1225 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
... ...