ADAM / AIAHTML5

Commit 4cbb62b0907a2adb29c16f58f53dc96e94aeb68f

Authored by Utkarsh Singh
1 parent beeeae1a

Committed code regarding black border issue in CI and CA.

Inline Side-by-side
Showing 2 changed files with 23 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @4cbb62b
... ... @@ -576,17 +576,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
576 576 "slug": $rootScope.currentSlug
577 577 });
578 578  
  579 +
  580 + var jspContentHeight = $('.jsPanel-content').height();
  581 + var videoHeight = $('#divplayerinlineVideo div').height();
  582 + if (videoHeight <= 0)
  583 + videoHeight = 360;
  584 + var textH = $('.well').height();
  585 + textH = textH + 40;
  586 + var blackBorderHeight = jspContentHeight - (videoHeight + textH);
  587 +
579 588 if ($('.jsPanel-content').length > 0) {
580   - if ($('.jsPanel-content').height() - $('#canvasDiv').height() > 300) {
581   - $('.well').css('margin-bottom', $('.jsPanel-content').height() - $('#canvasDiv').height() + 150);
582   - }
583   - if ($('.jsPanel-content').height() - $('#canvasDiv').height() > 200) {
584   - $('.well').css('margin-bottom', $('.jsPanel-content').height() - $('#canvasDiv').height() + 80);
585   - }
586   - if ($('.jsPanel-content').height() - $('#canvasDiv').height() > 100) {
587   - $('.well').css('margin-bottom', $('.jsPanel-content').height() - $('#canvasDiv').height() + 50);
588   - }
589   - //$('.well').css('margin-bottom', $('.jsPanel-content').height() - $('#canvasDiv').height() + 20);
  589 + $('.well').css('margin-bottom', blackBorderHeight);
590 590 $('#divplayerinlineVideo').css('background', '#fff');
591 591 }
592 592  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @4cbb62b
... ... @@ -608,7 +608,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
608 608 "slug": $rootScope.currentSlug
609 609 });
610 610  
611   -
  611 + var jspContentHeight = $('.jsPanel-content').height();
  612 + var imgHeight = $('.img-thumbnail').find('img').height();
  613 + if (imgHeight <= 0)
  614 + imgHeight = 320;
  615 + var textH = $('.well').height();
  616 + textH = textH + 40;
  617 + var blackBorderHeight = jspContentHeight - (imgHeight + textH);
  618 + if ($('.jsPanel-content').length > 0) {
  619 + $('.jsPanel-btn-min').attr('style', 'display: none');
  620 + $('.jsPanel-btn-max').attr('style', 'display: none');
  621 + $('.jsPanel-btn-norm').attr('style', 'display: none');
  622 + $('.well').css('margin-bottom', blackBorderHeight);
  623 + }
612 624 }
613 625  
614 626  
... ...