'
+ var $el = $('
'
+ '
'
+ '
![]()
'
+ '
').appendTo('#grid-view');
$compile($el)($scope);
-
-
- $(".sidebar").mCustomScrollbar({
- autoHideScrollbar: true,
- //theme:"rounded"
- });
-
-
$scope.searchAIListViewData.push(
{
"_id": value._id,
@@ -533,10 +614,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
"_Title": value._Title,
"_contentImage": value._contentImage,
"_ThumbnailImage": value._ThumbnailImage,
-
-
});
}
+
});
$('table > #ListViewDiv > #searchItem').remove();
//Show Error Message in case of gridview if no data is found
@@ -548,18 +628,23 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$('#ListViewDiv').append('
| No illustration found for the selected search criteria! |
');
}
$rootScope.isLoading = false;
- $('#spinner').css('visibility', 'hidden');
+ setTimeout(function () {
+ $scope.EnableUI();
+ }, 10);
},
function (error) {
console.log(' $scope.IllustrationData = ' + error.statusText);
}
+
);
+
+
}
$scope.scroll = function () {
- $("html,body").scrollTop(0);
+ //$("html,body").scrollTop(0);
}
@@ -597,9 +682,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
if ($rootScope.refreshcheck == null) {
$location.path('/');
}
-
$rootScope.isLoading = true;
- $('#spinner').css('visibility', 'visible');
+ $('#aiSpinner').css('visibility', 'visible');
+ //$scope.DisableUI();
$scope.voId = $rootScope.getLocalStorageValue("currentAIImageId");
var counter = 1;
@@ -619,17 +704,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
.select('_contentImage');
$scope.clickedAIImage = "~/../content/images/ai/images/" + clickedAIImage[0]._contentImage;
+
if (clickedAIImage.length > 0) {
+
$.jsPanel({
id: 'aiImagePanel',
selector: '.aiView',
theme: 'success',
currentController: 'AIController',
parentSlug: 'ADAM-images',
- content: '
' +
+ content: '
' +
'
' +
'
' +
- '
' +
+ '
' +
'
',
//ajax: {
// url: 'app/views/ci/ci-view-detail.html'
@@ -637,49 +724,47 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
title: $rootScope.getLocalStorageValue("currentViewTitle"),
position: {
top: 70,
- left: 20,
+ left: 20,
},
size: { width: $(window).outerWidth() - 20, height: $(window).outerHeight() - 110 },
});
-
$('#canvasDiv img').load(function () {
-
+
$rootScope.isLoading = false;
- $('#spinner').css('visibility', 'hidden');
+ $('#aiSpinner').css('visibility', 'hidden');
+ var canvas = document.getElementById("canvas");
+ var canvasPaint = document.getElementById("canvasPaint");
+ canvas.height = $(".img-thumbnail").height();
+ canvasPaint.height = $(".img-thumbnail").height();
});
-
$rootScope.currentSlug = 'adam-images-detail';
-
$rootScope.openViews.push(
{
"module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentAIImageId,
"slug": $rootScope.currentSlug
});
-
-
- //$("#aiImagePanel .img-thumbnail").css("height", $("#aiImagePanel .jsPanel-content").height());
+
+ $("#aiImagePanel .img-thumbnail").css("min-height", $("#aiImagePanel .jsPanel-content").height());
$('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
var jspContentHeight = $('.jsPanel-content').height();
+
+
+
}
-
-
},
function (error) {
// handle errors here
console.log(' $scope.AIllustrationData = ' + error.statusText);
}
-
);
-
// console.log($rootScope.OpenAdamImages);
$('#AIView').css("height", $(window).outerHeight());
- $('#AIView').css("width", $(window).outerWidth());
-
+ $('#AIView').css("width", $(window).outerWidth());
}
$scope.$on('annotationToolEvent', function (event, data) {
@@ -691,15 +776,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$("#canvas").css("display", "block");
$("#canvasPaint").css("display", "block");
-
+
$rootScope.onDrawingCanvasClick();
$rootScope.FreeStylePaint();
});
- $scope.ReloadListViewImageDiv = function (id) {
+ $scope.ReloadListViewImageDiv = function (id,imgCount) {
//console.log(id);
$scope.idSelected = id;
$scope.hiderow = true;
+ $rootScope.isLoading = true;
+ $('#aiSpinner').css('visibility', 'visible');
+ $('#aiSpinner').css('zIndex', '20000');
+ //$scope.DisableUI();
var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
promise.then(
@@ -710,7 +799,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
SelectedAIthumbImage = new jinqJs()
.from($scope.IllustrationData.root.AIData)
.where('_id = ' + id)
- .select('_ThumbnailImage', '_id', '_Title');
+ .select('_ThumbnailImage', '_id', '_Title').slice(0, imgCount);
$scope.SelectedAIthumbImage = "~/../content/images/ai/thumbnails/" + SelectedAIthumbImage[0]._ThumbnailImage;
$scope.SelectedAIId = SelectedAIthumbImage[0]._id;
@@ -721,16 +810,18 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
var curAIListViewScroll = $rootScope.getLocalStorageValue("AIListViewScroll");
if (typeof (curAIListViewScroll) !== "undefined" && curAIListViewScroll !== null && curAIListViewScroll !== '') {
if (typeof InstallTrigger !== 'undefined') {
-
- $('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue("AIListViewScroll") });
+ $('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue("AIListViewScroll") });
}
else {
-
$('#ListViewDiv').scrollTop($rootScope.getLocalStorageValue("AIListViewScroll"));
}
}
-
+ $rootScope.isLoading = false;
+ $('#aiSpinner').css('visibility', 'hidden');
+ //setTimeout(function () {
+ // $scope.EnableUI();
+ //}, 10);
},
function (error) {
// handle errors here
@@ -746,9 +837,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$scope.hiderow = false;
}
}
-
-
-
}]
);
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index cd703b3..2d4dad6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1351,7 +1351,8 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
if (alreadyOpenThisView != null) {
for (var i = 0; i < $rootScope.openViews.length; i++) {
k++;
- if ($rootScope.openViews[i].body - views == title) {
+ //if ($rootScope.openViews[i].body - views == title) {
+ if ($rootScope.openViews[i].body-views == title) {
$rootScope.openViews.splice((k - 1), 1);
$rootScope.openViews.push(
@@ -5426,7 +5427,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
OpenJSPanel(); // open jsPanel here
if ($('#jsPanel-1').length > 0) {
- $('.jsPanel-btn-norm').attr('style', 'display: none');
+ $('.jsPanel-btn-norm').attr('style', 'display: block');
}
console.log('jsPanel loaded exist= ' + document.getElementById('jsPanel-1')); // document.getElementsByClassName('ppImagePanel'));
@@ -5596,18 +5597,23 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
ResizeImage(0);
}
});
-
- $(document).on('click', '#btnPrint', function () {
+
+ $(document).one('click', '#btnPrint', function () {
+
PrintDivContentByID('printBoxPor');
+ this.stopPropagation();
+
});
-
+
function PrintDivContentByID(id) {
-
if (id == 'printBoxPor') {
$("#printPSOptions").val("100%");
ResizeImage(1);
}
- var contents = document.getElementById(id).innerHTML;
+ var contents;
+ $(document).ready(function () {
+ contents = document.getElementById(id).innerHTML;
+ });
// code for printng in ipads
var $ua = navigator.userAgent;
if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
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 5b8c60a..574d5f6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
@@ -1,6 +1,6 @@
-
-
+
+
@@ -14,38 +14,41 @@
-
+
+
+
@@ -73,7 +76,7 @@
{{item._Title}}
-
+
@@ -94,8 +97,8 @@
+