ADAM / AIAHTML5

Commit 9beb762c73d29a928d1dc518543f2205fb4c622d

Authored by Amrita Vishnoi
2 parents f601412f 7b8a1a36

Merge branch 'dotissue' into Develop

Inline Side-by-side
Showing 1 changed file with 32 additions and 12 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @9beb762
... ... @@ -3440,18 +3440,38 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3440 3440 var curPosture = localStorage.getItem('currentViewTitle');
3441 3441  
3442 3442 if (document.getElementById('jsPanel-1')) { //document.getElementsByClassName('ppImagePanel')) {
3443   - setTimeout(function () {
3444   - document.getElementById('imgPortrait').setAttribute('src', dataURL);
3445   - document.getElementById('imgLandscape').setAttribute('src', dataURL);
3446   - document.getElementById('spnModulePor').innerHTML = curModule;
3447   - document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
3448   - document.getElementById('spnModuleLan').innerHTML = curModule;
3449   - document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
3450   - if ($('#printcontainer').length > 0) {
3451   - $("#printcontainer").css('width', $(window).outerWidth());
3452   - $("#printcontainer").css('height', $(window).outerHeight());
3453   - }
3454   - }, 320);
  3443 + if (dataURL == "" || dataURL == undefined)
  3444 + {
  3445 +
  3446 + setTimeout(function () {
  3447 + document.getElementById('imgPortrait').setAttribute('src', dataURL);
  3448 + document.getElementById('imgLandscape').setAttribute('src', dataURL);
  3449 + document.getElementById('spnModulePor').innerHTML = curModule;
  3450 + document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
  3451 + document.getElementById('spnModuleLan').innerHTML = curModule;
  3452 + document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
  3453 + if ($('#printcontainer').length > 0) {
  3454 + $("#printcontainer").css('width', $(window).outerWidth());
  3455 + $("#printcontainer").css('height', $(window).outerHeight());
  3456 + }
  3457 + }, 520);
  3458 + }
  3459 + else
  3460 + {
  3461 + setTimeout(function () {
  3462 + document.getElementById('imgPortrait').setAttribute('src', dataURL);
  3463 + document.getElementById('imgLandscape').setAttribute('src', dataURL);
  3464 + document.getElementById('spnModulePor').innerHTML = curModule;
  3465 + document.getElementById('spnBodyViewTitlePor').innerHTML = curPosture;
  3466 + document.getElementById('spnModuleLan').innerHTML = curModule;
  3467 + document.getElementById('spnBodyViewTitleLan').innerHTML = curPosture;
  3468 + if ($('#printcontainer').length > 0) {
  3469 + $("#printcontainer").css('width', $(window).outerWidth());
  3470 + $("#printcontainer").css('height', $(window).outerHeight());
  3471 + }
  3472 + }, 320);
  3473 + }
  3474 +
3455 3475 }
3456 3476  
3457 3477 $('#fileMenuAnchor').addClass('disableMenuannotation');
... ...