' +
'
' +
'

' +
'
' +
@@ -538,42 +539,36 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
});
-
$('#canvasDiv img').load(function () {
$rootScope.isLoading = false;
$('#spinner').css('visibility', 'hidden');
+
});
$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) {
@@ -583,8 +578,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(0,0,0)")
$('#outlineColor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" });
+
$("#canvas").css("display", "block");
$("#canvasPaint").css("display", "block");
+ //$("#canvas").css("min-height", $(".img-thumbnail").height());
+ //$("#canvasPaint").css("min-height", $(".img-thumbnail").height());
$rootScope.onDrawingCanvasClick();
$rootScope.FreeStylePaint();
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index cd703b3..5cf995b 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 == title) {
$rootScope.openViews.splice((k - 1), 1);
$rootScope.openViews.push(
@@ -5596,13 +5597,15 @@ 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);
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..6a73ffe 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
@@ -8,7 +8,7 @@