Commit ce175f162b023d7cf36ecf06fb9d6b241cd92282

Authored by Mukul Rajput
1 parent 2ca490b1

this is for 18045 , Ca issue maintain in ie

400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -71,7 +71,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -71,7 +71,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
71 else { 71 else {
72 $scope.setActiveTab(1); 72 $scope.setActiveTab(1);
73 $scope.reRunSearchOnLoad(); 73 $scope.reRunSearchOnLoad();
74 - $('html, body').animate({ scrollTop: localStorage.getItem('CAGridViewScroll') }); 74 + $('html, body').animate({ scrollTop: localStorage.getItem('CAGridViewScroll') }, 'slow');
75 } 75 }
76 76
77 77
@@ -403,7 +403,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -403,7 +403,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
403 if ($scope.searchCAListViewData.length == 0) { 403 if ($scope.searchCAListViewData.length == 0) {
404 var $el = $('<div class="col-sm-12" style="padding-left:25px;padding-top:10px;"><strong style="color:white;">No animation found for the selected search criteria!</strong></div>').appendTo('#grid-view'); 404 var $el = $('<div class="col-sm-12" style="padding-left:25px;padding-top:10px;"><strong style="color:white;">No animation found for the selected search criteria!</strong></div>').appendTo('#grid-view');
405 $compile($el)($scope); 405 $compile($el)($scope);
406 - $('table > #ListViewDiv > #searchAnimation').remove(); 406 + $('table > #ListViewDiv > #searchAnimation').remove();
407 $('#ListViewDiv').append('<tr id="searchAnimation"><td colspan="3"><strong style="color:black;">No animation found for the selected search criteria!</strong></td></tr>'); 407 $('#ListViewDiv').append('<tr id="searchAnimation"><td colspan="3"><strong style="color:black;">No animation found for the selected search criteria!</strong></td></tr>');
408 } 408 }
409 409
@@ -450,7 +450,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -450,7 +450,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
450 450
451 localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle); 451 localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle);
452 localStorage.setItem("currentBodyViewId", $event.currentTarget.id); 452 localStorage.setItem("currentBodyViewId", $event.currentTarget.id);
453 - var CAGridViewScrollPosition = $($window).scrollTop(); 453 + var CAGridViewScrollPosition = $($window).scrollTop();
454 localStorage.setItem('CAGridViewScroll', CAGridViewScrollPosition); 454 localStorage.setItem('CAGridViewScroll', CAGridViewScrollPosition);
455 var u = $location.url(); 455 var u = $location.url();
456 $location.url('/clinical-animations-detail'); 456 $location.url('/clinical-animations-detail');
@@ -580,17 +580,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -580,17 +580,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
580 }); 580 });
581 581
582 582
583 - var jspContentHeight = $('.jsPanel-content').height();  
584 - var videoHeight = $('#divplayerinlineVideo div').height();  
585 - if (videoHeight <= 0)  
586 - videoHeight = 360;  
587 - var textH = $('.video-subtitle').height();  
588 - textH = textH + 40;  
589 - var blackBorderHeight = jspContentHeight - (videoHeight + textH); 583 + var jspContentHeight = $('.jsPanel-content').height();
  584 + var videoHeight = $('#divplayerinlineVideo div').height();
  585 + if (videoHeight <= 0)
  586 + videoHeight = 360;
  587 + var textH = $('.video-subtitle').height();
  588 + textH = textH + 40;
  589 + var blackBorderHeight = jspContentHeight - (videoHeight + textH);
590 590
591 - if ($('.jsPanel-content').length > 0) { 591 + if ($('.jsPanel-content').length > 0) {
592 $('.video-subtitle').css('margin-bottom', blackBorderHeight); 592 $('.video-subtitle').css('margin-bottom', blackBorderHeight);
593 - $('#divplayerinlineVideo').css('background', '#fff'); 593 + $('#divplayerinlineVideo').css('background', '#fff');
594 } 594 }
595 595
596 } 596 }
@@ -646,14 +646,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -646,14 +646,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
646 646
647 var curCAListViewScroll = localStorage.getItem("CAListViewScroll"); 647 var curCAListViewScroll = localStorage.getItem("CAListViewScroll");
648 if (typeof (curCAListViewScroll) !== "undefined" && curCAListViewScroll !== null && curCAListViewScroll !== '') { 648 if (typeof (curCAListViewScroll) !== "undefined" && curCAListViewScroll !== null && curCAListViewScroll !== '') {
649 - if (typeof InstallTrigger !== 'undefined') {  
650 -  
651 - $('#ListViewDiv').animate({ scrollTop: localStorage.getItem("CAListViewScroll") });  
652 -  
653 - }  
654 - else  
655 - {  
656 - $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll")); 649 + if (typeof InstallTrigger !== 'undefined') {
  650 +
  651 + $('#ListViewDiv').animate({ scrollTop: localStorage.getItem("CAListViewScroll") });
  652 +
  653 + }
  654 + else
  655 + {
  656 + $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll"));
657 } 657 }
658 } 658 }
659 //else { 659 //else {