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

abvw/common/js/common.js

@@ -2089,6 +2089,11 @@ COMMON.LockScreen = function() {
         if (COMMON.isAnonymousLogin()) {
             return;
         }
+        //getitsでも発動しない
+		if( ClientData.isGetitsMode() == true ){
+			return;
+		}
+        
         var timeWaitLockScreen = COMMON.getTimeWaitLockScreen();        
         if (timeWaitLockScreen > 0) {
             //var message = I18N.i18nText("sysInfoScrLock01");

abvw/js/Limit_Access_Content.js

@@ -29,7 +29,7 @@ function checkLimitContent(contentId, funcOk, funcCancel, isNotUnlockScreen) {
             }
         );
 
-        lockLayout();
+        COMMON.lockLayout();
 
         $('#limit_level1 .message').html(messageLevel[contentId].alertMessage);
         $('#limit_level1').show().center();
@@ -85,7 +85,7 @@ function checkLimitContent(contentId, funcOk, funcCancel, isNotUnlockScreen) {
         );
 
         // lock layout
-        lockLayout();
+        COMMON.lockLayout();
 
         //reset input password
         $('#limit_level2 .message input').val('');

abvw/js/contentview_GetData.js

@@ -32,8 +32,9 @@ function getJsonContentInfo() {
 
 /* get url */
 function getURLPageImage(apiName) {
-    var sysSettings = avwSysSetting();
-    var url = sysSettings.apiUrl;
+    //var sysSettings = avwSysSetting();
+    //var url = sysSettings.apiUrl;
+    var url = ClientData.conf_apiUrl();
     url = AVWEB.format(url, ClientData.userInfo_accountPath()) + '/' + apiName;
     return url;
 };

abvw/js/detail.js

@@ -67,7 +67,7 @@ function openContentDetail() {
     //$("#contentdetail_dspBack").click(contentdetail_dspBack_Click);
     $("#contentdetail_dspRead").click(contentdetail_dspRead_Click);
 
-    lockLayout();
+    COMMON.lockLayout();
     $("#contentDetail").css('z-index', 101);
     $("#sectionContentDetail").show();
     $("#contentDetail").show();

abvw/js/header.js

@@ -373,7 +373,7 @@ HEADER.logoutFunction = function() {
 
             if (ClientData.userOpt_bkConfirmFlg() == 1) {  // Show confirming dialog                
                 //$('#dlgConfirmBackup1').dialog({ width: 600, height: 200, modal: true });
-                lockLayout();
+                COMMON.lockLayout();
                 $('#dlgConfirmBackup1').show();
                 $('#dlgConfirmBackup1').center();
 
@@ -383,7 +383,7 @@ HEADER.logoutFunction = function() {
             else {  // Do not show confirming dialog
                 if (ClientData.userOpt_logoutMode() == null || ClientData.userOpt_logoutMode() == undefined) {
                     //$('#dlgConfirmBackup1').dialog({ width: 600, height: 200, modal: true });
-                    lockLayout();
+                    COMMON.lockLayout();
                     $('#dlgConfirmBackup1').show();
                     $('#dlgConfirmBackup1').center();
                 }
@@ -484,7 +484,7 @@ HEADER.confirmWithBackupFunction = function(e) {
 	var remember = $('#chkRememberBackup').attr('checked');
 	COMMON.unlockLayout();
 	$('#dlgConfirmBackup1').css('z-index', '99');
-	lockLayout();
+	COMMON.lockLayout();
 
 	if (remember == 'checked') {
 
@@ -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 (isLogout) {
-            lockLayout();
+            COMMON.lockLayout();
         }
 
         $().toastmessage({ position: 'middle-center' });

abvw/js/login.js

@@ -430,7 +430,7 @@ LOGIN.OpenChangePasswordDialog = function(){
     // Clear all input values
     $("#main-password-change").show();
     $("#main-password-change").center();
-    lockLayout();
+    COMMON.lockLayout();
 };
 
 //Close Chnage Password Dialog
@@ -876,8 +876,12 @@ LOGIN.showContentViewByOpenUrl = function(strContentId) {
 		},
 		function (xmlHttpRequest, txtStatus, errorThrown) {
 			//見つからないかエラーなのでホームに移動
+			if( ClientData.isGetitsMode() == true ){
+				avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
+			} else {
 				avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
 			}
+		}
 	);
 
 };
@@ -888,7 +892,11 @@ LOGIN.alertMessageOkFunction_callback = function(){
 };
 //警告表示時のキャンセル処理
 LOGIN.alertMessageCancelFunction_callback = function(){
+	if( ClientData.isGetitsMode() == true ){
+		avwScreenMove("abvw/" + COMMON.ScreenIds.Login);
+	} else {
 		avwScreenMove("abvw/" + COMMON.ScreenIds.Home);
+	}
 };
 
 //Get param url

abvw/js/settings.js

@@ -707,7 +707,7 @@ function OpenChangePassword() {
     $("#txtPwdNew").val('');
     $("#txtPwdNewRe").val('');
 
-    lockLayout();
+    COMMON.lockLayout();
     $("#dlgChangePassword").show();
     $("#dlgChangePassword").center();
 
@@ -1022,7 +1022,7 @@ function openBackup() {
     //$("#dlgConfirmBackup").dialog("open");
     //$(".ui-dialog-titlebar").hide();
 
-    lockLayout();
+    COMMON.lockLayout();
     $("#dlgConfirmBackup").show();
     $("#dlgConfirmBackup").center();
 
@@ -1044,7 +1044,7 @@ function openRestore() {
 
     // check avaliable restore no.17
 
-    lockLayout();
+    COMMON.lockLayout();
     $("#dlgConfirmRestore").show();
     $("#dlgConfirmRestore").center();
 };