Merge branch 'feature/1.6.2_doutor' of…

Merge branch 'feature/1.6.2_doutor' of ssh://git@gitlab.agentec.jp/abook_web/web-viewer.git into feature/1.6.2_doutor

abvw/js/contentview_InitObjects.js

@@ -176,7 +176,16 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
         $('#divSearchResult li').die();
         $('#divSearchResult li').live('click', CONTENTVIEW_EVENTS.clickSearchDetail);
         /* copy text */
-        $('#copytext').click(CONTENTVIEW_EVENTS.showCopyText);
+
+        if(ClientData.serviceOpt_copy_text() == 'Y') {
+
+        	$('#copytext').click(CONTENTVIEW_EVENTS.showCopyText);
+        } else {
+        	$('#copytext').unbind('click');
+        	$('#copytext').removeClass();
+            $('#copytext').addClass('copy_off');
+        }
+       // sessionStorage.removeItem('copy_text');
         /* close copy text dialog */
         //$("#copyTextClosing").click(CONTENTVIEW_EVENTS.closeCopyTextBox);
         $("#copyTextClosing").on({

abvw/js/login.js

@@ -79,7 +79,6 @@ LOGIN.saveLoginInfo = function(paramLid, paramP, accountPath) {
 	ClientData.userInfo_sid_local_bak(LOGIN.userinfo_sid);
 
 	LOGIN.saveServiceUserOption();
-
 	//ページジャンプ設定をクリア
 	ClientData.JumpQueue([]);
 	ClientData.IsJumpBack(false);
@@ -486,13 +485,15 @@ LOGIN.saveServiceUserOption = function(){
         else if (option.serviceOptionId == 28) {
             ClientData.serviceOpt_user_data_backup(option.value);
         }
+        else if (option.serviceOptionId == 42) {
+            ClientData.serviceOpt_copy_text(option.value);
+        }
         else if (option.serviceOptionId == 60) {
             ClientData.serviceOpt_web_screen_lock(option.value);
         }
         else if (option.serviceOptionId == 61) {
             ClientData.serviceOpt_web_screen_lock_wait(option.value);
         }
-
         else if( option.serviceOptionId == 70) {
             ClientData.serviceOpt_catalog_edition(option.value);
         }
@@ -642,6 +643,7 @@ LOGIN.initLoginAnonymousUser = function() {
 
             // save service user option
             LOGIN.saveServiceUserOption();
+
             // hide splash screen then move to home page
             $('#anonymous').fadeOut('slow', 'swing', function () {
 				//カタログエディション対応判定