Skip to content

C
check
Commit a6895437 by Masaru Abe
Options

common.jsのリファクタリング修正

parent d2982151
Showing with 29 additions and 15 deletions
abvw/common/js/common.js
...@@ -2089,6 +2089,11 @@ COMMON.LockScreen = function() { ...@@ -2089,6 +2089,11 @@ COMMON.LockScreen = function() {
if (COMMON.isAnonymousLogin()) { if (COMMON.isAnonymousLogin()) {
return; return;
} }
//getitsでも発動しない
if( ClientData.isGetitsMode() == true ){
return;
}
var timeWaitLockScreen = COMMON.getTimeWaitLockScreen(); var timeWaitLockScreen = COMMON.getTimeWaitLockScreen();
if (timeWaitLockScreen > 0) { if (timeWaitLockScreen > 0) {
//var message = I18N.i18nText("sysInfoScrLock01"); //var message = I18N.i18nText("sysInfoScrLock01");
......
abvw/js/Limit_Access_Content.js
...@@ -29,7 +29,7 @@ function checkLimitContent(contentId, funcOk, funcCancel, isNotUnlockScreen) { ...@@ -29,7 +29,7 @@ function checkLimitContent(contentId, funcOk, funcCancel, isNotUnlockScreen) {
} }
); );
lockLayout(); COMMON.lockLayout();
$('#limit_level1 .message').html(messageLevel[contentId].alertMessage); $('#limit_level1 .message').html(messageLevel[contentId].alertMessage);
$('#limit_level1').show().center(); $('#limit_level1').show().center();
...@@ -85,7 +85,7 @@ function checkLimitContent(contentId, funcOk, funcCancel, isNotUnlockScreen) { ...@@ -85,7 +85,7 @@ function checkLimitContent(contentId, funcOk, funcCancel, isNotUnlockScreen) {
); );
// lock layout // lock layout
lockLayout(); COMMON.lockLayout();
//reset input password //reset input password
$('#limit_level2 .message input').val(''); $('#limit_level2 .message input').val('');
......
abvw/js/contentview_GetData.js
...@@ -32,8 +32,9 @@ function getJsonContentInfo() { ...@@ -32,8 +32,9 @@ function getJsonContentInfo() {
/* get url */ /* get url */
function getURLPageImage(apiName) { function getURLPageImage(apiName) {
var sysSettings = avwSysSetting(); //var sysSettings = avwSysSetting();
var url = sysSettings.apiUrl; //var url = sysSettings.apiUrl;
var url = ClientData.conf_apiUrl();
url = AVWEB.format(url, ClientData.userInfo_accountPath()) + '/' + apiName; url = AVWEB.format(url, ClientData.userInfo_accountPath()) + '/' + apiName;
return url; return url;
}; };
......
abvw/js/detail.js
...@@ -67,7 +67,7 @@ function openContentDetail() { ...@@ -67,7 +67,7 @@ function openContentDetail() {
//$("#contentdetail_dspBack").click(contentdetail_dspBack_Click); //$("#contentdetail_dspBack").click(contentdetail_dspBack_Click);
$("#contentdetail_dspRead").click(contentdetail_dspRead_Click); $("#contentdetail_dspRead").click(contentdetail_dspRead_Click);
lockLayout(); COMMON.lockLayout();
$("#contentDetail").css('z-index', 101); $("#contentDetail").css('z-index', 101);
$("#sectionContentDetail").show(); $("#sectionContentDetail").show();
$("#contentDetail").show(); $("#contentDetail").show();
......
abvw/js/header.js
...@@ -373,7 +373,7 @@ HEADER.logoutFunction = function() { ...@@ -373,7 +373,7 @@ HEADER.logoutFunction = function() {
if (ClientData.userOpt_bkConfirmFlg() == 1) { // Show confirming dialog if (ClientData.userOpt_bkConfirmFlg() == 1) { // Show confirming dialog
//$('#dlgConfirmBackup1').dialog({ width: 600, height: 200, modal: true }); //$('#dlgConfirmBackup1').dialog({ width: 600, height: 200, modal: true });
lockLayout(); COMMON.lockLayout();
$('#dlgConfirmBackup1').show(); $('#dlgConfirmBackup1').show();
$('#dlgConfirmBackup1').center(); $('#dlgConfirmBackup1').center();
...@@ -383,7 +383,7 @@ HEADER.logoutFunction = function() { ...@@ -383,7 +383,7 @@ HEADER.logoutFunction = function() {
else { // Do not show confirming dialog else { // Do not show confirming dialog
if (ClientData.userOpt_logoutMode() == null || ClientData.userOpt_logoutMode() == undefined) { if (ClientData.userOpt_logoutMode() == null || ClientData.userOpt_logoutMode() == undefined) {
//$('#dlgConfirmBackup1').dialog({ width: 600, height: 200, modal: true }); //$('#dlgConfirmBackup1').dialog({ width: 600, height: 200, modal: true });
lockLayout(); COMMON.lockLayout();
$('#dlgConfirmBackup1').show(); $('#dlgConfirmBackup1').show();
$('#dlgConfirmBackup1').center(); $('#dlgConfirmBackup1').center();
} }
...@@ -484,7 +484,7 @@ HEADER.confirmWithBackupFunction = function(e) { ...@@ -484,7 +484,7 @@ HEADER.confirmWithBackupFunction = function(e) {
var remember = $('#chkRememberBackup').attr('checked'); var remember = $('#chkRememberBackup').attr('checked');
COMMON.unlockLayout(); COMMON.unlockLayout();
$('#dlgConfirmBackup1').css('z-index', '99'); $('#dlgConfirmBackup1').css('z-index', '99');
lockLayout(); COMMON.lockLayout();
if (remember == 'checked') { if (remember == 'checked') {
...@@ -574,7 +574,7 @@ HEADER.DoBackup = function(isBackupMarking, isBackupMemo, isBackupBookmark,isLog ...@@ -574,7 +574,7 @@ HEADER.DoBackup = function(isBackupMarking, isBackupMemo, isBackupBookmark,isLog
if ((ClientData.isChangedBookmark() == true && isBackupBookmark) || (ClientData.isChangedMarkingData() == true && isBackupMarking) || (ClientData.isChangedMemo() == true && isBackupMemo)) { if ((ClientData.isChangedBookmark() == true && isBackupBookmark) || (ClientData.isChangedMarkingData() == true && isBackupMarking) || (ClientData.isChangedMemo() == true && isBackupMemo)) {
if (isLogout) { if (isLogout) {
lockLayout(); COMMON.lockLayout();
} }
$().toastmessage({ position: 'middle-center' }); $().toastmessage({ position: 'middle-center' });
......
abvw/js/login.js
...@@ -430,7 +430,7 @@ LOGIN.OpenChangePasswordDialog = function(){ ...@@ -430,7 +430,7 @@ LOGIN.OpenChangePasswordDialog = function(){
// Clear all input values // Clear all input values
$("#main-password-change").show(); $("#main-password-change").show();
$("#main-password-change").center(); $("#main-password-change").center();
lockLayout(); COMMON.lockLayout();
}; };
//Close Chnage Password Dialog //Close Chnage Password Dialog
...@@ -876,7 +876,11 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) { ...@@ -876,7 +876,11 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
}, },
function (xmlHttpRequest, txtStatus, errorThrown) { function (xmlHttpRequest, txtStatus, errorThrown) {
//見つからないかエラーなのでホームに移動 //見つからないかエラーなのでホームに移動
avwScreenMove("abvw/" + COMMON.ScreenIds.Home); if( ClientData.isGetitsMode() == true ){
avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
} else {
avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
} }
); );
...@@ -888,7 +892,11 @@ LOGIN.alertMessageOkFunction_callback = function(){ ...@@ -888,7 +892,11 @@ LOGIN.alertMessageOkFunction_callback = function(){
}; };
//警告表示時のキャンセル処理 //警告表示時のキャンセル処理
LOGIN.alertMessageCancelFunction_callback = function(){ LOGIN.alertMessageCancelFunction_callback = function(){
avwScreenMove("abvw/" + COMMON.ScreenIds.Home); if( ClientData.isGetitsMode() == true ){
avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
} else {
avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
}
}; };
//Get param url //Get param url
......
abvw/js/settings.js
...@@ -707,7 +707,7 @@ function OpenChangePassword() { ...@@ -707,7 +707,7 @@ function OpenChangePassword() {
$("#txtPwdNew").val(''); $("#txtPwdNew").val('');
$("#txtPwdNewRe").val(''); $("#txtPwdNewRe").val('');
lockLayout(); COMMON.lockLayout();
$("#dlgChangePassword").show(); $("#dlgChangePassword").show();
$("#dlgChangePassword").center(); $("#dlgChangePassword").center();
...@@ -1022,7 +1022,7 @@ function openBackup() { ...@@ -1022,7 +1022,7 @@ function openBackup() {
//$("#dlgConfirmBackup").dialog("open"); //$("#dlgConfirmBackup").dialog("open");
//$(".ui-dialog-titlebar").hide(); //$(".ui-dialog-titlebar").hide();
lockLayout(); COMMON.lockLayout();
$("#dlgConfirmBackup").show(); $("#dlgConfirmBackup").show();
$("#dlgConfirmBackup").center(); $("#dlgConfirmBackup").center();
...@@ -1044,7 +1044,7 @@ function openRestore() { ...@@ -1044,7 +1044,7 @@ function openRestore() {
// check avaliable restore no.17 // check avaliable restore no.17
lockLayout(); COMMON.lockLayout();
$("#dlgConfirmRestore").show(); $("#dlgConfirmRestore").show();
$("#dlgConfirmRestore").center(); $("#dlgConfirmRestore").center();
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment