diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
index a862d05..493a81f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -71,7 +71,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
else {
$scope.setActiveTab(1);
$scope.reRunSearchOnLoad();
- $('html, body').animate({ scrollTop: localStorage.getItem('CAGridViewScroll') });
+ $('html, body').animate({ scrollTop: localStorage.getItem('CAGridViewScroll') }, 'slow');
}
@@ -403,7 +403,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
if ($scope.searchCAListViewData.length == 0) {
var $el = $('
No animation found for the selected search criteria!
').appendTo('#grid-view');
$compile($el)($scope);
- $('table > #ListViewDiv > #searchAnimation').remove();
+ $('table > #ListViewDiv > #searchAnimation').remove();
$('#ListViewDiv').append('No animation found for the selected search criteria! |
');
}
@@ -450,7 +450,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle);
localStorage.setItem("currentBodyViewId", $event.currentTarget.id);
- var CAGridViewScrollPosition = $($window).scrollTop();
+ var CAGridViewScrollPosition = $($window).scrollTop();
localStorage.setItem('CAGridViewScroll', CAGridViewScrollPosition);
var u = $location.url();
$location.url('/clinical-animations-detail');
@@ -580,17 +580,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
});
- var jspContentHeight = $('.jsPanel-content').height();
- var videoHeight = $('#divplayerinlineVideo div').height();
- if (videoHeight <= 0)
- videoHeight = 360;
- var textH = $('.video-subtitle').height();
- textH = textH + 40;
- var blackBorderHeight = jspContentHeight - (videoHeight + textH);
+ var jspContentHeight = $('.jsPanel-content').height();
+ var videoHeight = $('#divplayerinlineVideo div').height();
+ if (videoHeight <= 0)
+ videoHeight = 360;
+ var textH = $('.video-subtitle').height();
+ textH = textH + 40;
+ var blackBorderHeight = jspContentHeight - (videoHeight + textH);
- if ($('.jsPanel-content').length > 0) {
+ if ($('.jsPanel-content').length > 0) {
$('.video-subtitle').css('margin-bottom', blackBorderHeight);
- $('#divplayerinlineVideo').css('background', '#fff');
+ $('#divplayerinlineVideo').css('background', '#fff');
}
}
@@ -646,14 +646,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
var curCAListViewScroll = localStorage.getItem("CAListViewScroll");
if (typeof (curCAListViewScroll) !== "undefined" && curCAListViewScroll !== null && curCAListViewScroll !== '') {
- if (typeof InstallTrigger !== 'undefined') {
-
- $('#ListViewDiv').animate({ scrollTop: localStorage.getItem("CAListViewScroll") });
-
- }
- else
- {
- $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll"));
+ if (typeof InstallTrigger !== 'undefined') {
+
+ $('#ListViewDiv').animate({ scrollTop: localStorage.getItem("CAListViewScroll") });
+
+ }
+ else
+ {
+ $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll"));
}
}
//else {