Skip to content

C
check
Commit ff02a188 by vietdo
Options

#15771 【Chrome42】CMS でオーサリングのプレビューを行うと、Web Viewer で多重ログインの問題が発生する

parent 3debc584
Showing with 120 additions and 120 deletions
abvw/common/js/common.js
This source diff could not be displayed because it is too large. You can view the blob instead.
abvw/js/contentpreview.js
...@@ -3,66 +3,66 @@ ...@@ -3,66 +3,66 @@
var CONTENTPREVIEW = {}; var CONTENTPREVIEW = {};
CONTENTPREVIEW.ready = function(){ CONTENTPREVIEW.ready = function(){
if(!AVWEB.avwUserSessionObj){ if(!AVWEB.avwUserSessionObj){
AVWEB.avwCreateUserSession(); AVWEB.avwCreateUserSession();
} }
var sysSettings = AVWEB.avwSysSetting(); // get info in conf.json
var sid = COMMON.getUrlParam('sid','');
var contentId = COMMON.getUrlParam('contentId','');
var urlPath = COMMON.getUrlParam('urlpath','');
ClientData.userInfo_sid_preview(sid);
ClientData.userInfo_sid_local_preview(sid);
ClientData.userInfo_accountPath(urlPath);
ClientData.contentInfo_contentId(contentId);
ClientData.conf_apiUrl( sysSettings.apiUrl );
ClientData.conf_apiLoginUrl( sysSettings.apiLoginUrl );
ClientData.conf_apiResourceDlUrl( sysSettings. apiResourceDlUrl );
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){
//メニュー表示設定
$('#top_toolbar').hide();
$('#search_toolbar').hide();
$('#close_toolbar').show();
//読み込み完了時の処理
I18N.i18nReplaceText();
CONTENTPREVIEW.defaultValue = {
pageTransition : CONTENTVIEW_GENERAL.animateTypeKeys.Type_Slide,
pageTransitionPeriod : 1,
bookmarkData : [],
memoData: [],
markingData: [],
isMarkingDsp : false,
isMemoDsp: false,
userOpt_marking : 'N'
};
ClientData.userOpt_pageTransition(CONTENTPREVIEW.defaultValue.pageTransition);
ClientData.userOpt_pageTransitionPeriod(CONTENTPREVIEW.defaultValue.pageTransitionPeriod);
ClientData.BookMarkData(CONTENTPREVIEW.defaultValue.bookmarkData);
ClientData.MemoData(CONTENTPREVIEW.defaultValue.memoData);
ClientData.MarkingData(CONTENTPREVIEW.defaultValue.markingData);
ClientData.userOpt_makingDsp(CONTENTPREVIEW.defaultValue.isMarkingDsp);
ClientData.serviceOpt_marking(CONTENTPREVIEW.defaultValue.userOpt_marking);
ClientData.IsAddingMarking(false);
ClientData.IsAddingMemo(false);
ClientData.IsDisplayMarking(false);
ClientData.IsDisplayMemo(false);
CONTENTVIEW_INITOBJECT.clearViewerComponent();
CONTENTVIEW.cssInit();
$("#viewer").show();
CONTENTVIEW.ready(contentId);
});
var sysSettings = AVWEB.avwSysSetting(); // get info in conf.json
var sid = COMMON.getUrlParam('sid','');
var contentId = COMMON.getUrlParam('contentId','');
var urlPath = COMMON.getUrlParam('urlpath','');
ClientData.userInfo_sid(sid);
ClientData.userInfo_sid_local(sid);
ClientData.userInfo_accountPath(urlPath);
ClientData.contentInfo_contentId(contentId);
ClientData.conf_apiUrl( sysSettings.apiUrl );
ClientData.conf_apiLoginUrl( sysSettings.apiLoginUrl );
ClientData.conf_apiResourceDlUrl( sysSettings. apiResourceDlUrl );
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){
//メニュー表示設定
$('#top_toolbar').hide();
$('#search_toolbar').hide();
$('#close_toolbar').show();
//読み込み完了時の処理
I18N.i18nReplaceText();
CONTENTPREVIEW.defaultValue = {
pageTransition : CONTENTVIEW_GENERAL.animateTypeKeys.Type_Slide,
pageTransitionPeriod : 1,
bookmarkData : [],
memoData: [],
markingData: [],
isMarkingDsp : false,
isMemoDsp: false,
userOpt_marking : 'N'
};
ClientData.userOpt_pageTransition(CONTENTPREVIEW.defaultValue.pageTransition);
ClientData.userOpt_pageTransitionPeriod(CONTENTPREVIEW.defaultValue.pageTransitionPeriod);
ClientData.BookMarkData(CONTENTPREVIEW.defaultValue.bookmarkData);
ClientData.MemoData(CONTENTPREVIEW.defaultValue.memoData);
ClientData.MarkingData(CONTENTPREVIEW.defaultValue.markingData);
ClientData.userOpt_makingDsp(CONTENTPREVIEW.defaultValue.isMarkingDsp);
ClientData.serviceOpt_marking(CONTENTPREVIEW.defaultValue.userOpt_marking);
ClientData.IsAddingMarking(false);
ClientData.IsAddingMemo(false);
ClientData.IsDisplayMarking(false);
ClientData.IsDisplayMemo(false);
CONTENTVIEW_INITOBJECT.clearViewerComponent();
CONTENTVIEW.cssInit();
$("#viewer").show();
CONTENTVIEW.ready(contentId);
});
}; };
$(document).ready(function(){ $(document).ready(function(){
......
abvw/js/contentview.js
This source diff could not be displayed because it is too large. You can view the blob instead.
abvw/js/home.js
This source diff could not be displayed because it is too large. You can view the blob instead.
login.html
...@@ -38,79 +38,79 @@ ...@@ -38,79 +38,79 @@
<![endif]--> <![endif]-->
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
LOGIN.ready(); LOGIN.ready();
}); });
</script> </script>
</head> </head>
<body id="login"> <body id="login">
<div id="anonymous"> <div id="anonymous">
<img src="./abvw/img/login/logo_login.png" width="200" class="clearboth"/> <img src="./abvw/img/login/logo_login.png" width="200" class="clearboth"/>
</div> </div>
<div id="normalUser"> <div id="normalUser">
<!-- <!--
<div id="loader"><img src="./abvw/img/login/loading_icon.gif" width="200" height="200"></div> <div id="loader"><img src="./abvw/img/login/loading_icon.gif" width="200" height="200"></div>
<div id="fade"></div> <div id="fade"></div>
--> -->
<div class="wrapper"> <div class="wrapper">
<div id="main-ws"> <div id="main-ws">
<ul class="floatR" id="menu-language"><li class="language"><a id="language-ja"><img src="./abvw/img/common/flg_jpn.png" width="29" height="20"></a></li><li class="language"><a id="language-en"><img src="./abvw/img/common/flg_usa.png" width="29" height="20"></a></li><li class="language"><a id="language-ko"><img src="./abvw/img/common/flg_kor.png" width="29" height="20"></a></li></ul> <ul class="floatR" id="menu-language"><li class="language"><a id="language-ja"><img src="./abvw/img/common/flg_jpn.png" width="29" height="20"></a></li><li class="language"><a id="language-en"><img src="./abvw/img/common/flg_usa.png" width="29" height="20"></a></li><li class="language"><a id="language-ko"><img src="./abvw/img/common/flg_kor.png" width="29" height="20"></a></li></ul>
<article> <article>
<img src="./abvw/img/login/logo_login.png" width="200" class="clearboth" id="logologin"> <img src="./abvw/img/login/logo_login.png" width="200" class="clearboth" id="logologin">
<section id="formlogin" style="display:none;"> <section id="formlogin" style="display:none;">
<table width="440" border="0" cellspacing="0"> <table width="440" border="0" cellspacing="0">
<tr> <tr>
<th width="33%" class="lang" lang="txtLoginAccPath">アカウントパス</th> <th width="33%" class="lang" lang="txtLoginAccPath">アカウントパス</th>
<td width="67%"><input type="text" id="txtAccPath" maxlength="60" /></td> <td width="67%"><input type="text" id="txtAccPath" maxlength="60" /></td>
</tr> </tr>
<tr> <tr>
<th class="lang" lang="txtLoginId">ログインID</th> <th class="lang" lang="txtLoginId">ログインID</th>
<td><input type="text" id="txtAccId" maxlength="54" /></td> <td><input type="text" id="txtAccId" maxlength="54" /></td>
</tr> </tr>
<tr> <tr>
<th class="lang" lang="txtLoginPwd">パスワード</th> <th class="lang" lang="txtLoginPwd">パスワード</th>
<td><input type="password" id="txtPassword"/></td> <td><input type="password" id="txtPassword"/></td>
</tr> </tr>
</table> </table>
<p class="error lang" id="main-error-message" style="display:none;">パスワードまたはIDに誤りがあります</p> <p class="error lang" id="main-error-message" style="display:none;">パスワードまたはIDに誤りがあります</p>
<p class="memory"><input type="checkbox" id="chkRemember" /><label class="lang" lang="txtLoginPwdRbr" for="chkRemember">アカウントパスとログインIDを記憶する</label></p> <p class="memory"><input type="checkbox" id="chkRemember" /><label class="lang" lang="txtLoginPwdRbr" for="chkRemember">アカウントパスとログインIDを記憶する</label></p>
<a class="loginbtn lang" id="btnLogin" lang="dspLogin">ログイン</a> <a class="loginbtn lang" id="btnLogin" lang="dspLogin">ログイン</a>
</section> </section>
</article> </article>
</div> </div>
</div> </div>
<footer> <footer>
<div class="border"> <div class="border">
<div class="cnt_footer"> <div class="cnt_footer">
COPYRIGHT &copy; 2014 AGENTEC Co., Ltd. ALL RIGHTS RESERVED. COPYRIGHT &copy; 2014 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div> </div>
</div> </div>
</footer> </footer>
</div> </div>
<section id="main-password-change" class="sectionchangepassword"> <section id="main-password-change" class="sectionchangepassword">
<h1 class="title lang" lang="msgChangePassword"><!--パスワードを変更してください。--></h1> <h1 class="title lang" lang="msgChangePassword"><!--パスワードを変更してください。--></h1>
<span id="dialog-error-message" class="alertTxtDialog lang"></span> <span id="dialog-error-message" class="alertTxtDialog lang"></span>
<dl> <dl>
<dt class="lang" lang="txtPwdCurr"><!--旧パスワード:--></dt> <dt class="lang" lang="txtPwdCurr"><!--旧パスワード:--></dt>
<dd><input type="password" id="txtCurrentPass" maxlength="16" /></dd> <dd><input type="password" id="txtCurrentPass" maxlength="16" /></dd>
</dl> </dl>
<dl> <dl>
<dt class="lang" lang="txtPwdNew"><!--旧パスワード:--></dt> <dt class="lang" lang="txtPwdNew"><!--旧パスワード:--></dt>
<dd><input type="password" id="txtNewPass" maxlength="16" /></dd> <dd><input type="password" id="txtNewPass" maxlength="16" /></dd>
</dl> </dl>
<dl> <dl>
<dt class="lang" lang="txtPwdNewRe"><!--新パスワード（確認）：--></dt> <dt class="lang" lang="txtPwdNewRe"><!--新パスワード（確認）：--></dt>
<dd><input type="password" id="txtConfirmNew" maxlength="16" /></dd> <dd><input type="password" id="txtConfirmNew" maxlength="16" /></dd>
</dl> </dl>
<p class="lang" lang="txtPwdRemind" id="txtPwdRemind"><!--※スキップを選択すると、30日間このメッセージは表示されません--></p> <p class="lang" lang="txtPwdRemind" id="txtPwdRemind"><!--※スキップを選択すると、30日間このメッセージは表示されません--></p>
<p class="loginbtn"> <p class="loginbtn">
<a class="skip lang" id="btnSkip" lang="dspSkip"><!--スキップ--></a> <a class="skip lang" id="btnSkip" lang="dspSkip"><!--スキップ--></a>
<a class="change lang" id="btnChange" lang="dspChange"><!--変更--></a> <a class="change lang" id="btnChange" lang="dspChange"><!--変更--></a>
</p> </p>
</section> </section>
</body> </body>
......
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