diff --git a/Jenkinsfile b/Jenkinsfile index 0d6c8196..fbd19f5d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=676']) { + withEnv(['NEXT_BUILD_NUMBER=677']) { // env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-Tablet/Scripts/BrowserWindowSize.js b/MP-Tablet/Scripts/BrowserWindowSize.js index b2f04f76..bd693302 100644 --- a/MP-Tablet/Scripts/BrowserWindowSize.js +++ b/MP-Tablet/Scripts/BrowserWindowSize.js @@ -3,8 +3,11 @@ window.onresize = function (event) { SetWidthHeight(); } function SetWidthHeight() { - var height = $(window).height(); - var width = $(window).width(); + var height = $(window).outerHeight(); + var width = $(window).outerWidth(); + //var height = $(window).height(); + //var width = $(window).width(); + //$(window).innerHeight() * $(window).devicePixelRatio(); $.ajax({ url: "./windowSize.ashx", data: {