Merge branch 'Develop' into QA

Nikita Kulshreshtha
2 parents 9719344d f453fb7b
Showing 3 changed files with 19 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -2448,6 +2448,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                             //  $timeout(function () { $scope.DisableProgressBar() }, 1000);
+                          
                         };
@@ -2710,6 +2711,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                             }
                         }
+                        $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2);
+
                     };
                     worker.onerror = function (e) {
@@ -5983,7 +5986,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     $scope.enableZoom = function () {
-
+        $(".annotationTollbar").css("display", "none");
+        $("#annotationButton").removeClass("active");
         $("#btnExtract").removeClass("disabled");
         $("#btnTranparency").removeClass("disabled");
         $rootScope.isTransparencyBoxActivated = false;
 'use strict';
 AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout", "DataService", "AuthenticationService", "LoginConstants", "UserModules", "LoginMessageConstants", "AdminService", "$http", "AdminConstants", "UserTypeConstants",
-function ($rootScope, Modules, $log, $location, $timeout, DataService, AuthenticationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, AdminConstants, UserTypeConstants, $http) {
+function ($rootScope, Modules, $log, $location, $timeout, DataService, AuthenticationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, $http, AdminConstants, UserTypeConstants) {
     //$scope.pageToOpen = {
     //    name: 'MainMenu'
@@ -565,6 +565,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $('#daImagePanel').remove();
         if ($('#jsPanel-1').length > 0)
             $('#jsPanel-1').remove();
+
+        if ($('#3DImagePanel').length > 0)
+            $('#3DImagePanel').remove();
+
+        if ($('#ciImagePanel').length > 0)
+            $('#ciImagePanel').remove();
+
+        if ($('#caVideoPanel').length > 0)
+            $('#caVideoPanel').remove();
+
         $location.url('/' + slug);
         $rootScope.$broadcast('jsPanelCloseEvent', true);
@@ -1046,7 +1046,7 @@
                         <div class="modal-footer">
                             <div class="row">
                                 <input type="file" id="file1" style="display:none">
-                                <!--<a href="data:application/xml;charset=utf-8,your code here" download="filename.html">Save</a-->>
+                                <!--<a href="data:application/xml;charset=utf-8,your code here" download="filename.html">Save</a-->
                                 <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()"-->
                             </div>
                         </div>
@@ -1216,10 +1216,10 @@
     </div>
     <!--Available modules list modal after login-->
-    <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;">
+    <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; ">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
-                <div class="modal-header ui-draggable-handle " style="color: #ffffff; background-color: #0095da; border-color: #007ab3;">
+                <div class="modal-header ui-draggable-handle " style="color: #ffffff; background-color: #0095da; border-color: #007ab3;cursor:default;">
                     <!--color: #e5e5e5;-->
                     <!--bg-primary-->
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>