스크롤링 수정

main
이범준 1 year ago
parent 55ba73668a
commit 042e1a1982

@ -137,7 +137,8 @@ pageObject["${pageName}"] = {};
$(document).ready(function(){ $(document).ready(function(){
var $P = pageObject["${pageName}"]; var $P = pageObject["${pageName}"];
$P.scrollable = true;
/************************************************************************** /**************************************************************************
* DatasetControl * DatasetControl
**************************************************************************/ **************************************************************************/
@ -199,12 +200,17 @@ $(document).ready(function(){
} }
$P.scrollEnd = (obj) => { $P.scrollEnd = (obj) => {
if(!$P.scrollable){
return;
}
var el = $(obj); var el = $(obj);
if(el.scrollTop() == 0){ if(el.scrollTop() == 0){
return; return;
} }
if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
$P.scrollable = false;
$P.scrollCrdnList(); $P.scrollCrdnList();
} }
} }
@ -236,6 +242,8 @@ $(document).ready(function(){
//보안모드 //보안모드
fn_securityModeToggle($("#securityMode--top").is(":checked")); fn_securityModeToggle($("#securityMode--top").is(":checked"));
$P.scrollable = true;
} }
$P.getParams = () => { $P.getParams = () => {

@ -153,7 +153,8 @@ pageObject["${pageName}"] = {};
$(document).ready(function(){ $(document).ready(function(){
var $P = pageObject["${pageName}"]; var $P = pageObject["${pageName}"];
$P.scrollable = true;
/************************************************************************** /**************************************************************************
* DatasetControl * DatasetControl
**************************************************************************/ **************************************************************************/
@ -216,12 +217,17 @@ $(document).ready(function(){
} }
$P.scrollEnd = (obj) => { $P.scrollEnd = (obj) => {
if(!$P.scrollable){
return;
}
var el = $(obj); var el = $(obj);
if(el.scrollTop() == 0){ if(el.scrollTop() == 0){
return; return;
} }
if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
$P.scrollable = false;
$P.scrollCrdnList(); $P.scrollCrdnList();
} }
} }
@ -253,6 +259,8 @@ $(document).ready(function(){
//보안모드 //보안모드
fn_securityModeToggle($("#securityMode--top").is(":checked")); fn_securityModeToggle($("#securityMode--top").is(":checked"));
$P.scrollable = true;
} }
$P.getParams = () => { $P.getParams = () => {

@ -110,7 +110,8 @@ pageObject["${pageName}"] = {};
$(document).ready(function(){ $(document).ready(function(){
var $P = pageObject["${pageName}"]; var $P = pageObject["${pageName}"];
$P.scrollable = true;
/************************************************************************** /**************************************************************************
* DatasetControl * DatasetControl
**************************************************************************/ **************************************************************************/
@ -215,12 +216,17 @@ $(document).ready(function(){
} }
$P.scrollEnd = (obj) => { $P.scrollEnd = (obj) => {
if(!$P.scrollable){
return;
}
var el = $(obj); var el = $(obj);
if(el.scrollTop() == 0){ if(el.scrollTop() == 0){
return; return;
} }
if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
$P.scrollable = false;
$P.scrollCrdnList(); $P.scrollCrdnList();
} }
} }
@ -250,6 +256,8 @@ $(document).ready(function(){
//보안모드 //보안모드
fn_securityModeToggle($("#securityMode--top").is(":checked")); fn_securityModeToggle($("#securityMode--top").is(":checked"));
$P.scrollable = true;
} }
$P.getParams = () => { $P.getParams = () => {

@ -223,7 +223,8 @@ pageObject["${pageName}"] = {};
$(document).ready(function(){ $(document).ready(function(){
var $P = pageObject["${pageName}"]; var $P = pageObject["${pageName}"];
$P.scrollable = true;
/************************************************************************** /**************************************************************************
* DatasetControl * DatasetControl
**************************************************************************/ **************************************************************************/
@ -328,12 +329,17 @@ $(document).ready(function(){
} }
$P.scrollEnd = (obj) => { $P.scrollEnd = (obj) => {
if(!$P.scrollable){
return;
}
var el = $(obj); var el = $(obj);
if(el.scrollTop() == 0){ if(el.scrollTop() == 0){
return; return;
} }
if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
$P.scrollable = false;
$P.scrollCrdnList(); $P.scrollCrdnList();
} }
} }
@ -374,6 +380,8 @@ $(document).ready(function(){
$("#crdnTbody--${pageName}").html(trs.join()); $("#crdnTbody--${pageName}").html(trs.join());
fn_securityModeToggle($("#securityMode--top").is(":checked")); //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); //보안모드
$P.scrollable = true;
} }
$P.getParams = () => { $P.getParams = () => {

@ -335,7 +335,8 @@ pageObject["${pageName}"] = {};
$(document).ready(function(){ $(document).ready(function(){
var $P = pageObject["${pageName}"]; var $P = pageObject["${pageName}"];
$P.scrollable = true;
/************************************************************************** /**************************************************************************
* DatasetControl * DatasetControl
**************************************************************************/ **************************************************************************/
@ -486,12 +487,17 @@ $(document).ready(function(){
} }
$P.scrollEnd = (obj) => { $P.scrollEnd = (obj) => {
if(!$P.scrollable){
return;
}
var el = $(obj); var el = $(obj);
if(el.scrollTop() == 0){ if(el.scrollTop() == 0){
return; return;
} }
if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
$P.scrollable = false;
$P.scrollInspectionDataList(); $P.scrollInspectionDataList();
} }
} }
@ -620,7 +626,8 @@ $(document).ready(function(){
//보안모드 //보안모드
fn_securityModeToggle($("#securityMode--top").is(":checked")); fn_securityModeToggle($("#securityMode--top").is(":checked"));
$P.scrollable = true;
} }
$P.getParams = () => { $P.getParams = () => {

@ -118,7 +118,8 @@ pageObject["${pageName}"] = {};
$(document).ready(function(){ $(document).ready(function(){
var $P = pageObject["${pageName}"]; var $P = pageObject["${pageName}"];
$P.scrollable = true;
/************************************************************************** /**************************************************************************
* DatasetControl * DatasetControl
**************************************************************************/ **************************************************************************/
@ -172,12 +173,17 @@ $(document).ready(function(){
} }
$P.scrollEnd = (obj) => { $P.scrollEnd = (obj) => {
if(!$P.scrollable){
return;
}
var el = $(obj); var el = $(obj);
if(el.scrollTop() == 0){ if(el.scrollTop() == 0){
return; return;
} }
if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
$P.scrollable = false;
$P.scrollCrdnList(); $P.scrollCrdnList();
} }
} }
@ -211,6 +217,8 @@ $(document).ready(function(){
//보안모드 //보안모드
fn_securityModeToggle($("#securityMode--top").is(":checked")); fn_securityModeToggle($("#securityMode--top").is(":checked"));
$P.scrollable = true;
} }

@ -130,7 +130,8 @@ pageObject["${pageName}"] = {};
$(document).ready(function(){ $(document).ready(function(){
var $P = pageObject["${pageName}"]; var $P = pageObject["${pageName}"];
$P.scrollable = true;
/************************************************************************** /**************************************************************************
* DatasetControl * DatasetControl
**************************************************************************/ **************************************************************************/
@ -193,12 +194,17 @@ $(document).ready(function(){
} }
$P.scrollEnd = (obj) => { $P.scrollEnd = (obj) => {
if(!$P.scrollable){
return;
}
var el = $(obj); var el = $(obj);
if(el.scrollTop() == 0){ if(el.scrollTop() == 0){
return; return;
} }
if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) == el.outerHeight()){ if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
$P.scrollable = false;
$P.scrollCrdnList(); $P.scrollCrdnList();
} }
} }
@ -232,6 +238,8 @@ $(document).ready(function(){
//보안모드 //보안모드
fn_securityModeToggle($("#securityMode--top").is(":checked")); fn_securityModeToggle($("#securityMode--top").is(":checked"));
$P.scrollable = true;
} }
$P.getParams = () => { $P.getParams = () => {

@ -50,25 +50,25 @@
return 'FIREFOX'; return 'FIREFOX';
} else if (agent.indexOf('EDG') >= 0) { } else if (agent.indexOf('EDG') >= 0) {
return 'EDGE'; return 'EDGE';
} else if (agent.indexOf('SAFARI') >= 0) {
return 'SAFARI';
} else if (agent.indexOf('CHROME') >= 0) { } else if (agent.indexOf('CHROME') >= 0) {
return 'CHROME'; return 'CHROME';
} else if (agent.indexOf('SAFARI') >= 0) {
return 'SAFARI';
} else { } else {
return ''; return '';
} }
} }
const BROWSER_NAME = getBrowserName(); const BROWSER_NAME = getBrowserName();
var VERTICAL_SCROLL_HEIGHT = 15; var VERTICAL_SCROLL_HEIGHT = 14;
switch(BROWSER_NAME){ switch(BROWSER_NAME){
case "EDGE" : case "EDGE" :
VERTICAL_SCROLL_HEIGHT = 15; VERTICAL_SCROLL_HEIGHT = 14;
break; break;
case "FIREFOX" : case "FIREFOX" :
VERTICAL_SCROLL_HEIGHT = 17; VERTICAL_SCROLL_HEIGHT = 15;
break; break;
case "CHROME" : case "CHROME" :
VERTICAL_SCROLL_HEIGHT = 17; VERTICAL_SCROLL_HEIGHT = 15;
break; break;
} }

Loading…
Cancel
Save