Skip to content

C
check
Commit 2c2cc1e1 by Masaru Abe
Options

スクリーンロック対応

parent 38bf701c
Showing with 13 additions and 0 deletions
abvw/common/js/common.js
...@@ -2278,6 +2278,10 @@ COMMON.unlockFunction = function(inputPass) { ...@@ -2278,6 +2278,10 @@ COMMON.unlockFunction = function(inputPass) {
function (data) { function (data) {
if (data.result == 'success') { if (data.result == 'success') {
ClientData.userInfo_sid(data.sid); ClientData.userInfo_sid(data.sid);
ClientData.userInfo_sid_local(data.sid);
//バックアップにも保持
ClientData.userInfo_sid_local_bak(data.sid);
result = true; result = true;
//forceUnlockFunc(); //forceUnlockFunc();
...@@ -2307,10 +2311,16 @@ COMMON.unlockFunction = function(inputPass) { ...@@ -2307,10 +2311,16 @@ COMMON.unlockFunction = function(inputPass) {
if (result == true) { if (result == true) {
//ビューア画面ならイベントのアンロック
if ($("#viewer").length) {
//表示状態か
if( $('#viewer').is(':visible')){
if (window.CONTENTVIEW_EVENTS) { if (window.CONTENTVIEW_EVENTS) {
CONTENTVIEW_EVENTS.onUnlock(); CONTENTVIEW_EVENTS.onUnlock();
} }
} }
}
}
return { 'result': result, 'errorCode': errorCode, 'newTimeout': COMMON.getTimeWaitLockScreen() }; return { 'result': result, 'errorCode': errorCode, 'newTimeout': COMMON.getTimeWaitLockScreen() };
}; };
......
abvw/js/contentview_CreateObjects.js
...@@ -1410,6 +1410,9 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){ ...@@ -1410,6 +1410,9 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
// update sid id // update sid id
ClientData.userInfo_sid(data.sid); ClientData.userInfo_sid(data.sid);
ClientData.userInfo_sid_local(data.sid);
//バックアップにも保持
ClientData.userInfo_sid_local_bak(data.sid);
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode()){
//ストリーミングのビューアへ移動 //ストリーミングのビューアへ移動
......
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