'
+ '
@@ -252,8 +254,8 @@
'
@@ -382,7 +257,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
}, 10);
}
-
},
function (error) {
// handle errors here
@@ -440,14 +314,27 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
}
};
+ //Code changes by Sandeep for fixed bug-57854
$scope.Reset = function (query) {
$('ul li span').removeAttr("style");
query.SearchText = "";
$scope.idSelected = '';
+ $scope.hideListViewDiv();
//set localstorage values
localStorage.setItem("SearchText", '');
localStorage.setItem("SearchByAlphabet", '');
localStorage.setItem("AIListViewScroll", '');
+ localStorage.setItem("AIGridViewScroll", '');
+ localStorage.setItem("currentAITabView", '');
+ localStorage.setItem("AIListViewScrollPosition", '');
+ localStorage.setItem("AISelectedRowId", '');
+ localStorage.setItem("currentAIImageId", '');
+ localStorage.setItem("listViewSelectedID", '');
+ localStorage.setItem("AIGridViewHighlightThumbnail", '');
+ localStorage.setItem("currentViewTitle", '');
+ localStorage.setItem("currentImageTitleFromJson", '');
+ //localStorage.setItem("", '');
+ //localStorage.setItem("", '');
var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
if ($('.selected').hasClass("selected")) {
$('.selected').removeClass("selected");
@@ -455,13 +342,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$('#ListViewDiv').scrollTop(0);
- $scope.hideListViewDiv();
+ //$scope.hideListViewDiv();
$scope.filterstring = false;
while ($scope.searchAIListViewData.length) {
$scope.searchAIListViewData.pop();
}
- $scope.loadAllAI(ImageCount);
+ //$scope.loadAllAI(ImageCount);
}
$scope.ApplySearch = function (query) {
@@ -612,6 +499,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
if (AIListViewScroll !== null && $location.url() == "/ADAM-images" && AIListViewScroll != "0") {
$('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue('AIListViewScrollPosition') }, 'slow');
}
+ //if (_currentImgId != "null" && _currentImgId != null) {
+ // $('html, body').animate({ scrollTop: _currentImgId }, 'slow');
+ //}
else if (aISelectedRowId != "null" && aISelectedRowId != null) {
$('html, body').animate({ scrollTop: $('#' + aISelectedRowId).position().top }, 100);
}
@@ -827,30 +717,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
size: { width: $(window).outerWidth() - 30, height: $(window).outerHeight() - 125 },
});
-
- //$('#canvasDiv img').load(function () {
-
- // $rootScope.isLoading = false;
- // $('#aiSpinner').css('visibility', 'hidden');
- // var canvas = document.getElementById("canvas");
- // var canvasPaint = document.getElementById("canvasPaint");
-
- // var imageheight = $("#aimage").height();
- // var canvasDivheight = $(window).outerHeight() - 150;
-
- // if (canvasDivheight > imageheight) {
- // canvas.height = canvasDivheight;
- // canvasPaint.height = canvasDivheight;
- // }
- // else {
- // canvas.height = imageheight;
- // canvasPaint.height = imageheight;
- // }
-
- // canvas.width = $(window).outerWidth() - 81;
- // canvasPaint.width = $(window).outerWidth() - 81;
-
- //});
+
$('#canvasDiv img').load(function () {
$rootScope.isLoading = false;
$('#aiSpinner').css('visibility', 'hidden');
@@ -932,7 +799,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
//Set the scroll position of the tablebody to show selected row
- $scope.setImgPosition();
+ //$scope.setImgPosition();
$rootScope.isLoading = false;
$('#aiSpinner').css('visibility', 'hidden');
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 2b8d31a..e119733 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -147,10 +147,8 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
$("#messageModal").modal('show');
}
-
- $scope.helpTopicLink=function()
- {
- var dd = $("#helplinkId").html();
+
+ $scope.helpTopicLink = function () {
var absurl = $location.absUrl();
var hTopicUrl = absurl + "content/help/index.html";
var aboutADAM = absurl + "content/help/about/Adam_Credits_AIA5.html";
@@ -163,7 +161,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
}
$rootScope.initializeAIA = function () {
-
+
+ $rootScope.checkRefreshButtonClick = 1;
+
if (params != null && params != undefined && params != "") {
$scope.ValidateClientSiteUrl();
@@ -220,11 +220,11 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
$rootScope.getConfigurationValues();
}
+
$timeout(function () {
$scope.helpTopicLink();
}, 2000);
-
}
@@ -1402,9 +1402,9 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
$rootScope.PrintPreview = "PrintPreview";
$rootScope.exportImage = "exportImage";
$rootScope.PrintViewer = "PrintViewer";
- $rootScope.newCurriculum = "newCurriculum";
- $rootScope.openCurriculum = "openCurriculum";
- $rootScope.saveCurriculam = "saveCurriculam";
+ $rootScope.newCurriculum = "";
+ $rootScope.openCurriculum = "";
+ $rootScope.saveCurriculam = "";
}
else if ($location.url() == "/adam-images-detail") {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
index 5afc36c..550dcf3 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -129,6 +129,17 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
$scope.LabExerciseName = keywords.labexercise;
$scope.LabExerciseModules = null;
$scope.LabExerciseBoxes = null;
+
+ if ($scope.quiznumber == 1) {
+ $("#btnBackward").css('pointer-events', 'none');
+ }
+ else if ($scope.quiznumber == $scope.TotalNumberofQuiz) {
+ $("#btnForward").css('pointer-events', 'none');
+ }
+ else {
+ $("#btnBackward").css('pointer-events', 'auto');
+ $("#btnForward").css('pointer-events', 'auto');
+ }
//alert($scope.LabExerciseName)
var labExerciseModulePath = '~/../content/data/json/le/' + $scope.LabExerciseName + '.json';
@@ -1384,12 +1395,12 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
// email validation code
- var senderEmails = $("#emailTo").val().split(", ");
+ var senderEmails = $("#emailTo").val().split(",");
$scope.isSenderEmailValid = false;
for (var i = 0; i <= senderEmails.length - 1; i++) {
- var sEmail = senderEmails[i];
- if ($.trim(sEmail).length == 0) {
+ var sEmail = $.trim(senderEmails[i]);
+ if (sEmail.length == 0) {
//alert('*Email To email address is empty');
$scope.isSenderEmailValid = false;
// event.preventDefault();
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
index 453fc02..1161790 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
@@ -230,7 +230,9 @@
-
{{option.OptionTitle}}
+
+ {{option.OptionTitle}}
+
-
-
+
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
index 217547d..fc0b903 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
@@ -71,7 +71,7 @@
-
- 
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
index 91985f1..c48606d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
@@ -44,13 +44,13 @@
-
+