diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index 0d6f826..75deb23 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -626,16 +626,18 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout "slug": $rootScope.currentSlug }); + + $("#ciImagePanel .img-thumbnail").css("height", $("#ciImagePanel .jsPanel-content").height()); var jspContentHeight = $('.jsPanel-content').height(); - var imgHeight = $('.img-thumbnail').find('img').height(); - if (imgHeight <= 0) - imgHeight = 320; - var textH = $('.img-subtitle').height(); - textH = textH + 40; - var blackBorderHeight = jspContentHeight - (imgHeight + textH); - if ($('.jsPanel-content').length > 0) { - $('.img-subtitle').css('margin-bottom', blackBorderHeight); - } + //var imgHeight = $('.img-thumbnail').find('img').height(); + //if (imgHeight <= 0) + // imgHeight = 320; + //var textH = $('.img-subtitle').height(); + //textH = textH + 40; + //var blackBorderHeight = jspContentHeight - (imgHeight + textH); + //if ($('.jsPanel-content').length > 0) { + // $('.img-subtitle').css('margin-bottom', blackBorderHeight); + //} } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 1c7eb64..552660c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -247,9 +247,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou if (document.getElementById('aaDetailPageDiv') != null) { //0.4 added some stylesheets - $('.aaBodyView').css("height", $(window).outerHeight() - $('.navbar-fixed-top').height()); - $('.aaBodyView').css("width", $(window).outerWidth()); - $rootScope.canvasDivHeight = $('.aaBodyView').height(); + + $rootScope.canvasDivHeight = $('.jsPanel-content').height() - $('.main2 .stickey-area').height(); $('.canvasDivClass').css("height", $rootScope.canvasDivHeight); diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/html2canvas.js b/400-SOURCECODE/AIAHTML5.Web/libs/html2canvas.js index 9acca44..84a7b9c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/libs/html2canvas.js +++ b/400-SOURCECODE/AIAHTML5.Web/libs/html2canvas.js @@ -2858,7 +2858,7 @@ _html2canvas.Renderer.Canvas = function(options) { if (/*@cc_on!@*/false || !!document.documentMode) { var imgData = canvas.getContext("2d").getImageData(bounds.left, bounds.top, bounds.width, bounds.height); - ctx.putImageData(imgData, 50, 0); + ctx.putImageData(imgData, 0, 0); } else {