ADAM / AIAHTML5

Commit 5a3b7d4599f7a6dc344a040240cc06fb34daa147

Authored by Birendra Kumar
1 parent 31fa4f5c

fix jspanel for CI

Inline Side-by-side
Showing 3 changed files with 22 additions and 12 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @5a3b7d4
... ... @@ -804,8 +804,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
804 804 // open JS panel for curriculum with define cornonate in CB jason
805 805 $scope.jsPanelWidth = $scope.ciOpenInOtherModules.size.width;//1000;
806 806 $scope.jsPanelHeight = $scope.ciOpenInOtherModules.size.height;
807   - if ($scope.ciOpenInOtherModules.size.height > 500)
808   - $scope.jsPanelHeight = 500;
  807 + if ($scope.ciOpenInOtherModules.size.height > 540)
  808 + $scope.jsPanelHeight = 540;
809 809 $scope.jsPanelLeft = 320;
810 810 $scope.jsPanelTop = $rootScope.cBModulejsPanelTop();
811 811  
... ... @@ -856,10 +856,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
856 856  
857 857 $("#" + $scope.jsPanelID + " .img-thumbnail").css("height", $("#" + $scope.jsPanelID + " .jsPanel-content").height());
858 858  
859   - $('#CIView').css("height", $(window).outerHeight() - 65);
  859 + if (!$rootScope.isCallFromOtherModule) {
  860 + $('#CIView').css("height", $(window).outerHeight() - 65);
860 861  
861   - $('#CIView').css("width", $(window).outerWidth() - 15);
862   -
  862 + $('#CIView').css("width", $(window).outerWidth() - 46);
  863 +
  864 +
  865 + }
863 866  
864 867 if ($rootScope.isCallFromOtherModule) {
865 868 var canvasDIvHeight = parseInt($("#" + $scope.jsPanelID).outerHeight()) - 40;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @5a3b7d4
... ... @@ -385,9 +385,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
385 385 $scope.ImagePanelclick();
386 386 var imfgEle = document.getElementById("imgtag");
387 387 if (imfgEle!=null)
388   - imfgEle.src = "data:image/png;base64," + $rootScope.windowsimageSource;
  388 + imfgEle.src = "data:image/png;base64," + $rootScope.windowsimageSource;
389 389  
  390 + setTimeout(function () {
  391 + var cleintht=imfgEle.clientHeight;
  392 + if(cleintht>0)
  393 + $('.jsPanel-content').css('height', cleintht);
390 394 $scope.CBEnableUI();
  395 + }, 200)
391 396  
392 397 }, 200)
393 398 }
... ...
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js
  View file @5a3b7d4
... ... @@ -856,10 +856,11 @@ var jsPanel = {
856 856 }
857 857 var pathname = window.location.pathname;
858 858 //birendra
  859 + var currentController = panel.option.currentController;
859 860 if (pathname == "/curriculum-builder-detail")
860 861 {
861 862  
862   - var currentController = panel.option.currentController;
  863 +
863 864 if (currentController == 'DAController') {
864 865 var len= (panel.option.id).split("_").length;
865 866 var MultiWinId = (panel.option.id).split("_")[len-1];
... ... @@ -889,7 +890,7 @@ var jsPanel = {
889 890 panel.css({
890 891 top: parseInt(80),
891 892 left: parseInt(320),
892   - width: parseInt(1025),
  893 + width: currentController == 'CIController' ? 1010 : 1025,
893 894 height: currentController == 'CIController' ? 550 : 580,
894 895 });
895 896  
... ... @@ -898,7 +899,7 @@ var jsPanel = {
898 899 {
899 900 panel.css({
900 901 top: parseInt(70),//panel.option.maximizedMargin.top),
901   - left: parseInt(panel.option.maximizedMargin.left),
  902 + left:currentController == 'CIController' ? 15 : parseInt(panel.option.maximizedMargin.left),
902 903 width: parseInt(panel.parent().outerWidth(), 10) - parseInt(panel.option.maximizedMargin.left) - parseInt(panel.option.maximizedMargin.right),
903 904 height: parseInt(panel.parent().outerHeight()) - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom) - 65
904 905 });
... ... @@ -1046,10 +1047,11 @@ var jsPanel = {
1046 1047 } else {
1047 1048 panelTop = panel.option.position.top;
1048 1049 }
1049   - var pathname = window.location.pathname;
  1050 + var pathname = window.location.pathname;
  1051 + var currentController = panel.option.currentController;
1050 1052 if (pathname == "/curriculum-builder-detail")
1051 1053 {
1052   - var currentController = panel.option.currentController;
  1054 +
1053 1055 if (currentController == 'DAController') {
1054 1056 var len= (panel.option.id).split("_").length;
1055 1057 var MultiWinId = (panel.option.id).split("_")[len-1];
... ... @@ -1088,7 +1090,7 @@ var jsPanel = {
1088 1090 else
1089 1091 {
1090 1092 panel.css({
1091   - width: panel.option.size.width,
  1093 + width: currentController == 'CIController' ? panel.option.size.width-18 : panel.option.size.width,
1092 1094 height: parseInt(panel.option.size.height, 10) + 35,
1093 1095 top: panelTop,
1094 1096 left: panel.option.position.left
... ...