Skip to content

Tenzing / pdf-customizer

Go to a project
Toggle navigation
Toggle navigation pinning
78d5bd03 by Jeff Balicki
Options

3

1 parent eebb4620
Inline Side-by-side
Showing 1 changed file with 17 additions and 12 deletions
...@@ -233,24 +233,26 @@ function changePdfOptions(json, edit) { ...@@ -233,24 +233,26 @@ function changePdfOptions(json, edit) {
233 var windowHeight = 0.86 * $(window).height(); 233 var windowHeight = 0.86 * $(window).height();
234 234
235 var windowHBG = 0.923 * $(window).height(); 235 var windowHBG = 0.923 * $(window).height();
236 var pwidth = parseInt(json[0].pwidth);
237 var pheight = parseInt(json[0].pheight);
236 238
237 if(json[0].pwidth > json[0].pheight){ 239 if(pwidth > pheight){
238 console.log('wide') 240 //console.log('wide')
239 var scaleImage = windowWidth / json[0].pwidth; 241 var scaleImage = windowWidth / pwidth;
240 var imageHeight = json[0].pheight * scaleImage; 242 var imageHeight = pheight * scaleImage;
241 var imageWidth = windowWidth; 243 var imageWidth = windowWidth;
242 var imgLeft = 0; 244 var imgLeft = 0;
243 var imgTop = 25; 245 var imgTop = 25;
244 }else{ 246 }else{
245 var scaleImage = windowHeight / json[0].pheight; 247 var scaleImage = windowHeight / pheight;
246 var imageHeight = windowHeight; 248 var imageHeight = windowHeight;
247 var imageWidth = json[0].pwidth * scaleImage; 249 var imageWidth = pwidth * scaleImage;
248 var imgLeft = 30; 250 var imgLeft = 30;
249 var imgTop = 2; 251 var imgTop = 2;
250 } 252 }
251 253
252 254
253 console.log('windowWidth'+windowWidth ,'windowHeight'+windowHeight,'pheight'+json[0].pheight,'pwidth'+json[0].pwidth,'imageWidth'+imageWidth, 'imageHeight'+imageHeight); 255 // console.log('windowWidth'+windowWidth ,'windowHeight'+windowHeight,'pheight'+json[0].pheight,'pwidth'+json[0].pwidth,'imageWidth'+imageWidth, 'imageHeight'+imageHeight);
254 256
255 pdflist += '<div id="pdfPreview" style="" class="column">'; 257 pdflist += '<div id="pdfPreview" style="" class="column">';
256 // pdflist += '<img id="pdfimage" src="' + pdf_customizer + '/fileentry/getImage/' + json[0].folder + '/' + json[0].example + '" width="300px">'; 258 // pdflist += '<img id="pdfimage" src="' + pdf_customizer + '/fileentry/getImage/' + json[0].folder + '/' + json[0].example + '" width="300px">';
...@@ -502,17 +504,20 @@ function returnOptions(form) { ...@@ -502,17 +504,20 @@ function returnOptions(form) {
502 var windowHeight = 0.86 * $(window).height(); 504 var windowHeight = 0.86 * $(window).height();
503 505
504 var windowHBG = 0.923 * $(window).height(); 506 var windowHBG = 0.923 * $(window).height();
507 var pwidth = parseInt(json[0].pwidth);
508 var pheight = parseInt(json[0].pheight);
505 509
506 if(json[0].pwidth > json[0].pheight){ 510
507 var scaleImage = windowWidth / json[0].pwidth; 511 if(pwidth > pheight){
508 var imageHeight = json[0].pheight * scaleImage; 512 var scaleImage = windowWidth / pwidth;
513 var imageHeight = pheight * scaleImage;
509 var imageWidth = windowWidth; 514 var imageWidth = windowWidth;
510 var imgLeft = 0; 515 var imgLeft = 0;
511 var imgTop = 25; 516 var imgTop = 25;
512 }else{ 517 }else{
513 var scaleImage = windowHeight / json[0].pheight; 518 var scaleImage = windowHeight / pheight;
514 var imageHeight = windowHeight; 519 var imageHeight = windowHeight;
515 var imageWidth = json[0].pwidth * scaleImage; 520 var imageWidth = pwidth * scaleImage;
516 var imgLeft = 30; 521 var imgLeft = 30;
517 var imgTop = 2; 522 var imgTop = 2;
518 } 523 }
......