From 26ccbd947d2d5e14695ff132ed5887195a86561b Mon Sep 17 00:00:00 2001 From: Birendra Date: Thu, 2 Sep 2021 12:25:22 +0530 Subject: [PATCH] fix max size in js panel --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js | 4 +++- 400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js | 2 ++ 400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js | 20 +++++++++++++------- 400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js | 297 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------- 400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js | 2 ++ 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 1 + 400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js | 2 ++ 400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js | 2 ++ 400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js | 1 + 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js | 2 ++ 400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js | 3 ++- 11 files changed, 216 insertions(+), 120 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index 85b15a2..49e1557 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js @@ -439,7 +439,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location theme: 'success', currentController: '3dAController', parentSlug: $scope.Get3DwindowStoreData(windowviewid, 'parentSlugName'), - content: '
' + + content: '
' + '' + '
', title: tittle, @@ -545,6 +545,8 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location $scope.jsPanel3D.normalize(); } $rootScope.AllPanelObject(windowviewid,$scope.jsPanel3D); + + $("#ThreeDImagePanel_"+windowviewid).css('overflow','hidden'); // set false after initial call of min,max or normal $scope.Set3DwindowStoreData(windowviewid, 'minmaxAutoEvent', false); $scope.Set3DwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js index 94d2cde..1baeabb 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js @@ -1285,6 +1285,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout } $rootScope.AllPanelObject(windowviewid,$scope.jsPanelAI); + $("#aiImagePanel_"+windowviewid).css('overflow','hidden'); + // set false after initial call of min,max or normal $scope.SetAIwindowStoreData(windowviewid, 'minmaxAutoEvent', false); $scope.SetAIwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js index cea5ad0..a1139a5 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js @@ -304,7 +304,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout var uid = $scope.GetAODwindowStoreData(windowviewid, 'uid'); var requestType = $scope.GetAODwindowStoreData(windowviewid, 'requestType'); var aodSiteUrl = aodlink+"?SessionId=" + $rootScope.userData.SessionId + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self"; - //var aodSiteUrl = aodlink+"?SessionId=1625199179202" + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self"; + //var aodSiteUrl = aodlink+"?SessionId=1630041584051" + "&Courseid=" + courseid + "&type="+requestType +"&uID=" + uid+ ",_self"; $scope.jsPanelWidth = $(window).outerWidth() - 20; $scope.jsPanelHeight = $(window).outerHeight() - 140; @@ -318,9 +318,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout theme: 'success', currentController: 'AODController', parentSlug: $scope.GetAODwindowStoreData(windowviewid, 'parentSlugName'), - content: '
' + - ''+ - '
', + content: '
' + + ''+ + '
', title: tittle, position: { top: $scope.jsPanelTop, @@ -337,7 +337,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout var len = (pnlName).split("_").length; var windowviewid = (pnlName).split("_")[len - 1]; var canvasDIvHeight = $('#aodImagePanel_' + windowviewid+ " .jsPanel-content").height(); - $('#aodContentDiv_'+ windowviewid ).css("height",canvasDIvHeight); + $('#aodContentDiv_'+ windowviewid ).css("height",canvasDIvHeight+40); var $ua = navigator.userAgent; if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { var aodheight = screen.height; @@ -362,17 +362,23 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout var pnlName=event.currentTarget.id; var len = (pnlName).split("_").length; var windowviewid = (pnlName).split("_")[len - 1]; - + var canvasDIvHeight = $('#aodImagePanel_' + windowviewid+ " .jsPanel-content").height(); - $('#aodContentDiv_'+ windowviewid ).css("height",canvasDIvHeight); + $('#aodContentDiv_'+ windowviewid ).css("height",canvasDIvHeight+40); + var $ua = navigator.userAgent; + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { + $('#aodContentDiv_'+ windowviewid ).css("height",canvasDIvHeight); + } } }, + draggable: "disabled", }); $scope.jsPanelVideo.maximize(); $rootScope.AllPanelObject(windowviewid,$scope.jsPanelVideo); + $("#aodImagePanel_"+windowviewid).css('overflow','hidden'); $scope.SetAODwindowStoreData(windowviewid, 'currentSlug', 'AOD-view-detail'); $('html, body').animate({ scrollTop: 0 }); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index 2062bc9..6b212bc 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -1053,126 +1053,199 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout if (clickedCAVideo.length > 0 && clickedCASummary.length > 0) { - $scope.jsPanelCA = $.jsPanel({ - id: $scope.jsPanelID, - selector: '.caView', - theme: 'success', - currentController: 'CAController', - parentSlug: $scope.GetCAwindowStoreData(windowviewid, 'parentSlugName'), - content: '' + - '

' + clickedCASummary + '

', - - title: tittle, - position: { - top: $scope.jsPanelTop, - left: $scope.jsPanelLeft - }, - - size: { - width: $scope.jsPanelWidth, - height: $scope.jsPanelHeight - }, - onminimized:function (panel) { - var pnlName=panel[0].id; - var len = (pnlName).split("_").length; - var windowviewid = (pnlName).split("_")[len - 1]; - var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); - if(!isAutoCalled) - { - $rootScope.UnsaveCurriculum = true; - } - $scope.SetCAwindowStoreData(windowviewid, 'minimised',true); - $scope.SetCAwindowStoreData(windowviewid, 'maximised',false); - }, - onmaximized:function (panel) { - var pnlName=panel[0].id; - var len = (pnlName).split("_").length; - var windowviewid = (pnlName).split("_")[len - 1]; - var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); - if(!isAutoCalled) - { - $rootScope.UnsaveCurriculum = true; - } - $scope.SetCAwindowStoreData(windowviewid, 'maximised',true); - $scope.SetCAwindowStoreData(windowviewid, 'minimised',false); - var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); - $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); - $rootScope.resetMenuOptionOnClick(pnlName); - var $ua = navigator.userAgent; - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { - var aodheight = screen.height; - if(aodheight>=1024) - { - $("#caImagePanel_"+windowviewid).css('height',canvasDIvHeight+30-150); - $('#caImagePanel_' + windowviewid+ " .jsPanel-content").css('height',canvasDIvHeight-150); - $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-150-120 ); + + if($rootScope.linkToOpenCa==true) + { + $scope.jsPanelCA = $.jsPanel({ + id: $scope.jsPanelID, + selector: '.caView', + theme: 'success', + currentController: 'CAController', + parentSlug: $scope.GetCAwindowStoreData(windowviewid, 'parentSlugName'), + content: '' + + '

' + clickedCASummary + '

', + + title: tittle, + position: { + top: $scope.jsPanelTop, + left: $scope.jsPanelLeft + }, + + size: { + width: $scope.jsPanelWidth, + height: $scope.jsPanelHeight + }, + onmaximized:function (panel) { + var pnlName=panel[0].id; + var len = (pnlName).split("_").length; + var windowviewid = (pnlName).split("_")[len - 1]; + var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); + if(!isAutoCalled) + { + $rootScope.UnsaveCurriculum = true; } - else if(aodheight<1024) + $scope.SetCAwindowStoreData(windowviewid, 'maximised',true); + $scope.SetCAwindowStoreData(windowviewid, 'minimised',false); + var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); + $rootScope.resetMenuOptionOnClick(pnlName); + var $ua = navigator.userAgent; + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { + var aodheight = screen.height; + if(aodheight>=1024) + { + $("#caImagePanel_"+windowviewid).css('height',canvasDIvHeight+30-150); + $('#caImagePanel_' + windowviewid+ " .jsPanel-content").css('height',canvasDIvHeight-150); + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-150-120 ); + } + else if(aodheight<1024) + { + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); + } + } + }, + draggable: "disabled", + resizable: "disabled", + controls: { buttons: 'none' } + }); + } + else + { + $scope.jsPanelCA = $.jsPanel({ + id: $scope.jsPanelID, + selector: '.caView', + theme: 'success', + currentController: 'CAController', + parentSlug: $scope.GetCAwindowStoreData(windowviewid, 'parentSlugName'), + content: '' + + '

' + clickedCASummary + '

', + + title: tittle, + position: { + top: $scope.jsPanelTop, + left: $scope.jsPanelLeft + }, + + size: { + width: $scope.jsPanelWidth, + height: $scope.jsPanelHeight + }, + onminimized:function (panel) { + var pnlName=panel[0].id; + var len = (pnlName).split("_").length; + var windowviewid = (pnlName).split("_")[len - 1]; + var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); + if(!isAutoCalled) { - $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); - } - } - }, - onnormalized:function (panel) { - var pnlName=panel[0].id; - var len = (pnlName).split("_").length; - var windowviewid = (pnlName).split("_")[len - 1]; - var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); - if(!isAutoCalled) - { - $rootScope.UnsaveCurriculum = true; - } - $scope.SetCAwindowStoreData(windowviewid, 'minimised',false); - $scope.SetCAwindowStoreData(windowviewid, 'maximised',false); - var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); - $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); - $rootScope.resetMenuOptionOnClick(pnlName); - }, - resizable: { - stop: function (event, ui) { - var pnlName=event.currentTarget.id; + $rootScope.UnsaveCurriculum = true; + } + $scope.SetCAwindowStoreData(windowviewid, 'minimised',true); + $scope.SetCAwindowStoreData(windowviewid, 'maximised',false); + }, + onmaximized:function (panel) { + var pnlName=panel[0].id; var len = (pnlName).split("_").length; var windowviewid = (pnlName).split("_")[len - 1]; - $scope.SetCAwindowStoreData(windowviewid, 'width', ui.size.width); - $scope.SetCAwindowStoreData(windowviewid, 'height', ui.size.height); - $scope.SetCAwindowStoreData(windowviewid, 'y', ui.position.top); - $scope.SetCAwindowStoreData(windowviewid, 'x', ui.position.left); - $rootScope.UnsaveCurriculum = true; + var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); + if(!isAutoCalled) + { + $rootScope.UnsaveCurriculum = true; + } + $scope.SetCAwindowStoreData(windowviewid, 'maximised',true); + $scope.SetCAwindowStoreData(windowviewid, 'minimised',false); var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); - $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); - $rootScope.resetMenuOptionOnClick(pnlName); - } - - }, - draggable: { - stop: function( event, ui ) { - var pnlName=event.currentTarget.id; + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); + $rootScope.resetMenuOptionOnClick(pnlName); + var $ua = navigator.userAgent; + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { + var aodheight = screen.height; + if(aodheight>=1024) + { + $("#caImagePanel_"+windowviewid).css('height',canvasDIvHeight+30-150); + $('#caImagePanel_' + windowviewid+ " .jsPanel-content").css('height',canvasDIvHeight-150); + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-150-120 ); + } + else if(aodheight<1024) + { + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); + } + } + }, + onnormalized:function (panel) { + var pnlName=panel[0].id; var len = (pnlName).split("_").length; var windowviewid = (pnlName).split("_")[len - 1]; - $scope.SetCAwindowStoreData(windowviewid, 'y', ui.position.top); - $scope.SetCAwindowStoreData(windowviewid, 'x', ui.position.left); - $rootScope.UnsaveCurriculum = true; + var isAutoCalled = $scope.GetCAwindowStoreData(windowviewid, 'minmaxAutoEvent'); + if(!isAutoCalled) + { + $rootScope.UnsaveCurriculum = true; + } + $scope.SetCAwindowStoreData(windowviewid, 'minimised',false); + $scope.SetCAwindowStoreData(windowviewid, 'maximised',false); + var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); $rootScope.resetMenuOptionOnClick(pnlName); + }, + resizable: { + stop: function (event, ui) { + var pnlName=event.currentTarget.id; + var len = (pnlName).split("_").length; + var windowviewid = (pnlName).split("_")[len - 1]; + $scope.SetCAwindowStoreData(windowviewid, 'width', ui.size.width); + $scope.SetCAwindowStoreData(windowviewid, 'height', ui.size.height); + $scope.SetCAwindowStoreData(windowviewid, 'y', ui.position.top); + $scope.SetCAwindowStoreData(windowviewid, 'x', ui.position.left); + $rootScope.UnsaveCurriculum = true; + var canvasDIvHeight = $('#caImagePanel_' + windowviewid+ " .jsPanel-content").height(); + $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-120 ); + $rootScope.resetMenuOptionOnClick(pnlName); + } + + }, + draggable: { + stop: function( event, ui ) { + var pnlName=event.currentTarget.id; + var len = (pnlName).split("_").length; + var windowviewid = (pnlName).split("_")[len - 1]; + $scope.SetCAwindowStoreData(windowviewid, 'y', ui.position.top); + $scope.SetCAwindowStoreData(windowviewid, 'x', ui.position.left); + $rootScope.UnsaveCurriculum = true; + $rootScope.resetMenuOptionOnClick(pnlName); + } } - }, - - - }); + }); + } + var isMaximize = $scope.GetCAwindowStoreData(windowviewid, 'maximised'); var isMinimize = $scope.GetCAwindowStoreData(windowviewid, 'minimised'); @@ -1186,6 +1259,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout $scope.jsPanelCA.normalize(); } $rootScope.AllPanelObject(windowviewid,$scope.jsPanelCA); + + $("#caImagePanel_"+windowviewid).css('overflow','hidden'); // set false after initial call of min,max or normal $scope.SetCAwindowStoreData(windowviewid, 'minmaxAutoEvent', false); $scope.SetCAwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index 19a4a4a..89cf809 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -1083,6 +1083,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout } $rootScope.AllPanelObject(windowviewid,$scope.jsPanelCI); + + $("#ciImagePanel_"+windowviewid).css('overflow','hidden'); // set false after initial call of min,max or normal $scope.SetCIwindowStoreData(windowviewid, 'minmaxAutoEvent', false); $scope.SetCIwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index ec1efec..d16df54 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1092,6 +1092,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } $rootScope.AllPanelObject(windowviewid,$scope.jsPanelDA); + $("#daImagePanel_"+windowviewid).css('overflow','hidden'); // set false after initial call of min,max or normal $scope.SetwindowStoreData(windowviewid, 'minmaxAutoEvent', false); $scope.SetwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index dbda461..88aee81 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -498,6 +498,8 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, $scope.jsPanelLab.normalize(); } $rootScope.AllPanelObject(windowviewid,$scope.jsPanelLab); + + $("#labImagePanel_"+windowviewid).css('overflow','hidden'); // set false after initial call of min,max or normal $scope.SetLEwindowStoreData(windowviewid, 'minmaxAutoEvent', false); $scope.SetLEwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js index cd9fcda..d781155 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js @@ -415,6 +415,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout } $rootScope.AllPanelObject(windowviewid,$scope.jsPanelVideo); + + $("#vidImagePanel_"+windowviewid).css('overflow','hidden'); // set false after initial call of min,max or normal $scope.SetVideowindowStoreData(windowviewid, 'minmaxAutoEvent', false); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js index 4725651..1c8b547 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js @@ -383,6 +383,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout } $rootScope.AllPanelObject(windowviewid,$scope.jsPanelPIC); + $("#picImagePanel_"+windowviewid).css('overflow','hidden'); // set false after initial call of min,max or normal $scope.SetPICwindowStoreData(windowviewid, 'minmaxAutoEvent', false); $scope.SetPICwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 0294560..b03a88e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -740,6 +740,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $rootScope.AllPanelObject(windowviewid,$scope.jsPanelAA); + $("#AAImagePanel_"+windowviewid).css('overflow','hidden'); + // set false after initial call of min,max or normal $scope.SetAAwindowStoreData(windowviewid, 'minmaxAutoEvent', false); $scope.SetAAwindowStoreData(windowviewid, 'y', $scope.jsPanelTop); diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js b/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js index 692f0e1..edaff18 100644 --- a/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js +++ b/400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js @@ -874,6 +874,7 @@ var jsPanel = { { var pnltop=55; var ht=$(window).outerHeight()-10 - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom) - 43; + var wt=$(window).outerWidth()+8 - parseInt(panel.option.maximizedMargin.left) - parseInt(panel.option.maximizedMargin.right); if($('.navbar-fixed-top').css('display') == 'none') { //Change for CA link @@ -881,7 +882,7 @@ var jsPanel = { var ht=$(window).outerHeight() - parseInt(panel.option.maximizedMargin.top) - parseInt(panel.option.maximizedMargin.bottom); } - var wt=$(window).outerWidth() - parseInt(panel.option.maximizedMargin.left) - parseInt(panel.option.maximizedMargin.right)+1; + panel.css({ top: pnltop,//panel.option.maximizedMargin.top), left:parseInt(1),//panel.option.maximizedMargin.left -- libgit2 0.21.4