バックアップリストア対応

e3e221f1 · Masaru Abe · 0f78c21c · e3e221f1 · e3e221f1 · e3e221f1
Commit e3e221f1 authored Mar 17, 2015 by Masaru Abe
9 changed files
--- a/abvw/.htaccess
+++ b/abvw/.htaccess
-SetEnvIf Referer "^http://web3\.agentec\.jp/web_test/" RefererCheck
+#SetEnvIf Referer "^http://web3\.agentec\.jp/web_test/" RefererCheck
-Order deny,allow
+#Order deny,allow
-Deny from all
+#Deny from all
-Allow from env=RefererCheck
+#Allow from env=RefererCheck
 <Files ~ "\.(js|json)$">
 Header add Pragma "no-cache"
 Header set Cache-Control no-cache

--- a/abvw/common/json/lang/lang-en.json
+++ b/abvw/common/json/lang/lang-en.json
@@ -156,5 +156,6 @@
 "txtUrlValidDate": "validated period",
 "txtMaxDownloadCount": "number of max dl",
 "msgShareUrlPassword": "When you set a password, please input below.",
-"msgStreamingOpenError": "It is the contents that I cannot read in the streaming."
+"msgStreamingOpenError": "It is the contents that I cannot read in the streaming.",
+"txtBkContentStatus": "Content Status"
 }
--- a/abvw/common/json/lang/lang-ko.json
+++ b/abvw/common/json/lang/lang-ko.json
@@ -156,5 +156,6 @@
 "txtUrlValidDate": "URL유효기간",
 "txtMaxDownloadCount": "최대DL횟수",
 "msgShareUrlPassword": "암호를 설정할경우 다음의 입력란에 입력하십시오.",
-"msgStreamingOpenError": "스트리밍에서는 열람 할 수 없는 컨텐츠입니다."
+"msgStreamingOpenError": "스트리밍에서는 열람 할 수 없는 컨텐츠입니다.",
+"txtBkContentStatus": "콘텐츠 상태"
 }
--- a/abvw/js/contentsearch.js
+++ b/abvw/js/contentsearch.js
--- a/abvw/js/header.js
+++ b/abvw/js/header.js
@@ -620,7 +620,8 @@ HEADER.DoBackup = function(isBackupMarking, isBackupMemo, isBackupBookmark, isBa
                	//READステータス追加
                	if(ClientData.ReadingContentIds().length > 0){
                		for(var nIndex = 0; nIndex < ClientData.ReadingContentIds().length; nIndex++){
-                			HEADER.setContentStatus(ClientData.ReadingContentIds()[nIndex].contentid, 0 );
+                			//存在しない場合追加
+                			HEADER.addContentStatusRead(ClientData.ReadingContentIds()[nIndex].contentid);
                		}
                	}
@@ -1218,8 +1219,39 @@ HEADER.setContentStatus = function(contentId, status) {
    var newArray = [];
    ClientData.ContentStatusData(newArray);
    ClientData.ContentStatusData(arrContentStatus);
 };
+//JSONバックアップ前にWebでリード済のステータスがJSONになければ追加
+HEADER.addContentStatusRead = function(contentId) {
+	var arr = ClientData.ContentStatusData();
+	var hitFlg = false;
+	for (var nIndex1 = 0; nIndex1 < arr.length; nIndex1++) {
+		if(arr[nIndex1].contentId == contentId){
+			hitFlg = true;
+			break;
+		}
+	}
+	if(hitFlg == false ){
+		var obj = new ContentStatusEntity();
+		obj.contentId = contentId;
+		obj.status = 0; //read
+		// Add object to client
+		arr.push(obj);
+		//バックアップ対象フラグセット
+		ClientData.isChangedContentStatus(true);
+		//初期化したほうが良い？
+		var newArray = [];
+		ClientData.ContentStatusData(newArray);
+		ClientData.ContentStatusData(arr);
+	}
+};
 HEADER.getContentStatus = function(contentId) {
    var arr = ClientData.ContentStatusData();
    for (var nIndex1 = 0; nIndex1 < arr.length; nIndex1++) {

--- a/abvw/js/history.js
+++ b/abvw/js/history.js
--- a/abvw/js/home.js
+++ b/abvw/js/home.js
--- a/abvw/js/settings.js
+++ b/abvw/js/settings.js
@@ -713,6 +713,8 @@ SETTINGS.dspOptReset_Click = function(e) {
    $('#chkBkMemo').attr('checked', 'checked');
    // set default backup bookmark
    $('#chkBkShiori').attr('checked', 'checked');
+    // set default backup contentStatus
+    $('#chkBkContentStatus').attr('checked', 'checked');
    // reset page transition no.4
    $('#txtValueAnimation').val(1);
@@ -1044,6 +1046,13 @@ SETTINGS.initScreen = function() {
        $("#chkBkShiori").attr('checked', 'checked');
    }
+    if (ClientData.userOpt_bkContentStatusFlag() == 0) {
+        $("#chkBkContentStatus").removeAttr('checked');
+    }
+    else {
+        $("#chkBkContentStatus").attr('checked', 'checked');
+    }
    // load config page transition & page transition period  No.4
    $('#cboAnimation').val(ClientData.userOpt_pageTransition());

--- a/abvw/settings.html
+++ b/abvw/settings.html
@@ -153,13 +153,15 @@
 							<label id="txtOptBkCfm" for="chkOptBkCfm" lang="txtOptBkCfm" class="lang"><!--毎回ログアウトの時、バックアップするかどうかは必ず確認する--></label>
 						</label>
 						<br />
-						<label class="option_backup">
+						<!--<label class="option_backup">-->
+						<p class="option_backup" style="font-size: 13px;margin-left:50px">
 							<label id="txtBkDefault" lang="txtBkDefault" class="lang"><!--バックアップのデフォルト : --></label>
 							<input type="checkbox" id="chkBkMarking" class="chkbx" checked="checked" /><label id="txtBkMarking" for="chkBkMarking" lang="txtBkMarking" class="lang"><!--マーキング--></label>
 							<input type="checkbox" id="chkBkMemo" class="chkbx" checked="checked" /><label id="txtBkMemo" for="chkBkMemo" lang="txtBkMemo" class="lang"><!--メモ--></label>
 							<input type="checkbox" id="chkBkShiori" class="chkbx" checked="checked" /><label id="txtBkShiori" for="chkBkShiori" lang="txtBkShiori" class="lang"><!--しおり--></label>
 							<input type="checkbox" id="chkBkContentStatus" class="chkbx" checked="checked" /><label id="txtBkContentStatus" for="chkBkContentStatus" lang="txtBkContentStatus" class="lang"><!--コンテンツ状態--></label>
-						</label>
+						</p>
+						<!--</label>-->
 					</p>
 					<p class="backupbtn"><a class="backup lang" lang="dspOptBk" id="dspOptBk" href="#" style="display:none;"><!--バックアップ--></a><a href="#" id="dspOptRes" lang="dspOptRes" class="lang" style="visibility:hidden;"><!--リストア--></a></p>
 					<p class="savebtn"><a class="save lang" href="#" id="dspSave" lang="dspSave"><!--保存する--></a><a class="default lang" href="#" id="dspOptReset" lang="dspOptReset"><!--初期設定に戻る--></a><div style="clear:both;"></div></p>