Skip to content

C
check
Commit d87075ce by Vo Duc Thang
Options

08/23 Release 

 No.1: 汎用プッシュメッセージ
 No.8: スクリーンロック
 No.4： ページめくり効果:  設定変更画面,コンテンツ閲覧画面 (Mouse on PCのみ)
parent 15f984ed
Showing with 306 additions and 97 deletions
abvw/common/js/common.js
...@@ -297,7 +297,7 @@ var Keys = { ...@@ -297,7 +297,7 @@ var Keys = {
userOpt_bkShioriFlag: 'userOpt_bkShioriFlag', userOpt_bkShioriFlag: 'userOpt_bkShioriFlag',
// Local :ユーザオプション(userOpt)_ビューのアニメーション種類:Interger // Local :ユーザオプション(userOpt)_ビューのアニメーション種類:Interger
userOpt_pageTransition: 'userOpt_pageTransition', userOpt_pageTransition: 'userOpt_pageTransition',
// Local :ユーザオプション(userOpt)_アニメーション時間:Interger // Local :ユーザオプション(userOpt)_アニメーション時間:Float
userOpt_pageTransitionPeriod: 'userOpt_pageTransitionPeriod' userOpt_pageTransitionPeriod: 'userOpt_pageTransitionPeriod'
...@@ -1140,7 +1140,7 @@ var ClientData = { ...@@ -1140,7 +1140,7 @@ var ClientData = {
} }
}, },
// Local :ユーザオプション(userOpt)_アニメーション時間:Interger // Local :ユーザオプション(userOpt)_アニメーション時間:Float
userOpt_pageTransitionPeriod: function (data) { userOpt_pageTransitionPeriod: function (data) {
if (arguments.length > 0) { if (arguments.length > 0) {
operateData(arguments, Keys.userOpt_pageTransitionPeriod, undefined); operateData(arguments, Keys.userOpt_pageTransitionPeriod, undefined);
...@@ -2037,15 +2037,16 @@ function getTimeWaitLockScreen() { ...@@ -2037,15 +2037,16 @@ function getTimeWaitLockScreen() {
} }
else else
{ {
timeWaitLockScreen = parseInt(ClientData.serviceOpt_web_screen_lock_wait()) * 60000; // time unit is minute var temp = ClientData.serviceOpt_web_screen_lock_wait();
if (timeWaitLockScreen < 0) { timeWaitLockScreen = temp * 60000; // time unit is minute
if (timeWaitLockScreen < 0 || temp % 1 != 0) {
timeWaitLockScreen = sysSettings.screenlockTimeDefault * 60000; timeWaitLockScreen = sysSettings.screenlockTimeDefault * 60000;
} }
else if (timeWaitLockScreen == 0) { // no lockscreen else if (timeWaitLockScreen == 0) { // no lockscreen
timeWaitLockScreen = -1; timeWaitLockScreen = -1;
} }
} }
} }
return timeWaitLockScreen; return timeWaitLockScreen;
}; };
...@@ -2057,8 +2058,7 @@ function LockScreen() { ...@@ -2057,8 +2058,7 @@ function LockScreen() {
if (isAnonymousLogin()) { if (isAnonymousLogin()) {
return; return;
} }
var timeWaitLockScreen = getTimeWaitLockScreen(); var timeWaitLockScreen = getTimeWaitLockScreen();
if (timeWaitLockScreen > 0) { if (timeWaitLockScreen > 0) {
//var message = i18nText("sysInfoScrLock01"); //var message = i18nText("sysInfoScrLock01");
screenLock({ screenLock({
...@@ -2085,7 +2085,7 @@ function LockScreen() { ...@@ -2085,7 +2085,7 @@ function LockScreen() {
// The function will be called at the time: loading // The function will be called at the time: loading
$(function () { $(function () {
// Init setting values // Init setting values
if (avwUserSession()) { // Logged if (avwUserSession()) { // Logged
...@@ -2134,6 +2134,16 @@ $(function () { ...@@ -2134,6 +2134,16 @@ $(function () {
if (ClientData.userOpt_logoutMode() == null || ClientData.userOpt_logoutMode() == undefined) { if (ClientData.userOpt_logoutMode() == null || ClientData.userOpt_logoutMode() == undefined) {
ClientData.userOpt_logoutMode(0); ClientData.userOpt_logoutMode(0);
} }
// set default page transition No.4
if (ClientData.userOpt_pageTransition() == null || ClientData.userOpt_logoutMode() == undefined) {
ClientData.userOpt_pageTransition(0);
}
if (ClientData.userOpt_pageTransitionPeriod() == null || ClientData.userOpt_pageTransitionPeriod() == undefined) {
ClientData.userOpt_pageTransitionPeriod(1);
}
} }
}); });
...@@ -2167,10 +2177,10 @@ function unlockFunction(inputPass) { ...@@ -2167,10 +2177,10 @@ function unlockFunction(inputPass) {
ClientData.serviceOpt_web_screen_lock(option.value); ClientData.serviceOpt_web_screen_lock(option.value);
} }
else if (option.serviceName == 'web_screen_lock_wait') { else if (option.serviceName == 'web_screen_lock_wait') {
ClientData.serviceOpt_web_screen_lock_wait(option.value); ClientData.serviceOpt_web_screen_lock_wait(option.value);
} }
}); });
} }
}, },
function (xhr, statusText, errorThrown) { function (xhr, statusText, errorThrown) {
......
abvw/common/js/screenLock.js
...@@ -121,11 +121,11 @@ function screenLock(options) { ...@@ -121,11 +121,11 @@ function screenLock(options) {
// すでにロック状態かどうかをチェックし、ロック状態であれば、即ロックをかける // すでにロック状態かどうかをチェックし、ロック状態であれば、即ロックをかける
if(isLocked()) { if(isLocked()) {
idleStateTimeout = 0; idleStateTimeout = 0;
}
// clear lock state
removeLockState();
}
// clear lock state
removeLockState();
// set idle timeout // set idle timeout
idleTimerId = setTimeout(function() { idleTimerId = setTimeout(function() {
...@@ -216,26 +216,27 @@ function screenLock(options) { ...@@ -216,26 +216,27 @@ function screenLock(options) {
// execute unlock process // execute unlock process
function executeUnlock() { function executeUnlock() {
if(unlockFunc) { if (unlockFunc) {
var val = unlockFunc($('#passwd-txt').val(), forceUnlockFunc); var val = unlockFunc($('#passwd-txt').val(), forceUnlockFunc);
if(!val.result) { if (!val.result) {
$('#screenLockErrMsg').text(format(errorMessage, val.errorCode.errorMessage)); $('#screenLockErrMsg').text(format(errorMessage, val.errorCode.errorMessage));
$('#screenLockErrMsg').fadeIn(); $('#screenLockErrMsg').fadeIn();
$('#passwd-txt').focus(); $('#passwd-txt').focus();
// Set new timeout value
if (val.newTimeout) { return;
timeout = val.newTimeout; }
} else {
return; // Set new timeout value
} timeout = val.newTimeout;
/* }
if(!unlockFunc($('#passwd-txt').val(), forceUnlockFunc)) { /*
$('#screenLockErrMsg').fadeIn(); if(!unlockFunc($('#passwd-txt').val(), forceUnlockFunc)) {
$('#passwd-txt').focus(); $('#screenLockErrMsg').fadeIn();
return; $('#passwd-txt').focus();
} return;
*/ }
} */
}
defaultOptions.unlockFunc(elmId); defaultOptions.unlockFunc(elmId);
} }
......
abvw/common/json/lang/lang-en.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"Logout", "dspBkCancel":"Logout",
"txtSearchResult":"Result", "txtSearchResult":"Result",
"dspHome":"Home", "dspHome":"Home",
"txtLoginUser":"(Ver.20130712)User:", "txtLoginUser":"(Ver.20130823)User:",
"txtAll":"All", "txtAll":"All",
"txtMkgSize":"Size", "txtMkgSize":"Size",
"txtMkgS":"S", "txtMkgS":"S",
...@@ -129,14 +129,15 @@ ...@@ -129,14 +129,15 @@
"txtBkShiori":"EN_しおり", "txtBkShiori":"EN_しおり",
"txtResSelect":"EN_リストアするデータを選択してください。", "txtResSelect":"EN_リストアするデータを選択してください。",
"txtBkDefault":"EN_バックアップのデフォルト：", "txtBkDefault":"EN_バックアップのデフォルト：",
"txtOptPageTrans":"ビューのアニメーション種類", "txtOptPageTrans":"EN_ビューのアニメーション種類",
"txtOptPageTransSlide":"スライド", "txtOptPageTransSlide":"EN_スライド",
"txtOptPageTransFade":"フェード", "txtOptPageTransFade":"EN_フェード",
"txtOptPageTransRev":"リヴェール＆ムーブイン", "txtOptPageTransRev":"EN_リヴェール＆ムーブイン",
"txtOptPageTransPeriod":"アニメーション時間(Sec)", "txtOptPageTransPeriod":"EN_アニメーション時間(Sec)",
"msgPushAlert":"新着メッセージがあります！！！", "msgPushAlert":"EN_新着メッセージがあります！！！",
"txtPushAlert":"通知", "txtPushAlert":"EN_通知",
"txtNext":"次＞", "txtNext":"EN_次＞",
"txtPrevious":"＜前", "txtPrevious":"EN_＜前",
"msgAnonymousLoginErr":"ログインできません。(エラーコード：)" "msgAnonymousLoginErr":"EN_ログインできません。(エラーコード：{0})",
"msgAnonymousLoginErr2":"EN_ログインできません。"
} }
abvw/common/json/lang/lang-ja.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト", "dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果", "txtSearchResult":"検索結果",
"dspHome":"ホーム", "dspHome":"ホーム",
"txtLoginUser":"(Ver.20130712)ログイン中：", "txtLoginUser":"(Ver.20130823)ログイン中：",
"txtAll":"すべて", "txtAll":"すべて",
"txtMkgSize":"太さ", "txtMkgSize":"太さ",
"txtMkgS":"小", "txtMkgS":"小",
...@@ -138,6 +138,6 @@ ...@@ -138,6 +138,6 @@
"txtPushAlert":"通知", "txtPushAlert":"通知",
"txtNext":"次＞", "txtNext":"次＞",
"txtPrevious":"＜前", "txtPrevious":"＜前",
"msgAnonymousLoginErr":"ログインできません。(エラーコード：)" "msgAnonymousLoginErr":"ログインできません。(エラーコード：{0})",
"msgAnonymousLoginErr2":"ログインできません。"
} }
abvw/common/json/lang/lang-ko.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃", "dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과", "txtSearchResult":"검색 결과",
"dspHome":"홈", "dspHome":"홈",
"txtLoginUser":"(Ver.20130712)로그인 중:", "txtLoginUser":"(Ver.20130823)로그인 중:",
"txtAll":"전체", "txtAll":"전체",
"txtMkgSize":"두께", "txtMkgSize":"두께",
"txtMkgS":"소", "txtMkgS":"소",
...@@ -129,14 +129,15 @@ ...@@ -129,14 +129,15 @@
"txtBkShiori":"KO_しおり", "txtBkShiori":"KO_しおり",
"txtResSelect":"KO_リストアするデータを選択してください。", "txtResSelect":"KO_リストアするデータを選択してください。",
"txtBkDefault":"KO_バックアップのデフォルト：", "txtBkDefault":"KO_バックアップのデフォルト：",
"txtOptPageTrans":"ビューのアニメーション種類", "txtOptPageTrans":"KO_ビューのアニメーション種類",
"txtOptPageTransSlide":"スライド", "txtOptPageTransSlide":"KO_スライド",
"txtOptPageTransFade":"フェード", "txtOptPageTransFade":"KO_フェード",
"txtOptPageTransRev":"リヴェール＆ムーブイン", "txtOptPageTransRev":"KO_リヴェール＆ムーブイン",
"txtOptPageTransPeriod":"アニメーション時間(Sec)", "txtOptPageTransPeriod":"KO_アニメーション時間(Sec)",
"msgPushAlert":"新着メッセージがあります！！！", "msgPushAlert":"KO_新着メッセージがあります！！！",
"txtPushAlert":"通知", "txtPushAlert":"KO_通知",
"txtNext":"次＞", "txtNext":"KO_次＞",
"txtPrevious":"＜前", "txtPrevious":"KO_＜前",
"msgAnonymousLoginErr":"ログインできません。(エラーコード：)" "msgAnonymousLoginErr":"KO_ログインできません。(エラーコード：{0})",
"msgAnonymousLoginErr2":"KO_ログインできません。"
} }
abvw/contentview.html
...@@ -2,13 +2,12 @@ ...@@ -2,13 +2,12 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<!--<meta http-equiv="X-UA-Compatible" content="IE=9,chrome=1" />--> <meta http-equiv="X-UA-Compatible" content="IE=9,10,chrome=1" />
<meta http-equiv="Pragma" content="no-cache"> <meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Cache-Control" content="no-store"> <meta http-equiv="Cache-Control" content="no-store">
<meta http-equiv="Cache-Control" content="no-cache"> <meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1"> <meta http-equiv="Expires" content="-1">
<title> </title> <title> </title>
<link rel="stylesheet" type="text/css" href="./common/css/default.css" /> <link rel="stylesheet" type="text/css" href="./common/css/default.css" />
<link rel="stylesheet" type="text/css" href="./css/contentview.css" /> <link rel="stylesheet" type="text/css" href="./css/contentview.css" />
...@@ -50,6 +49,7 @@ ...@@ -50,6 +49,7 @@
<script src="./js/contentview_Marking.js"></script> <script src="./js/contentview_Marking.js"></script>
<script src="./js/contentview_PopupText.js"></script> <script src="./js/contentview_PopupText.js"></script>
<script src="./js/contentview_Paint.js"></script> <script src="./js/contentview_Paint.js"></script>
<script src="./js/contentview_Anket.js"></script>
<script src="common/js/zoomDetector.js" type="text/javascript"></script> <script src="common/js/zoomDetector.js" type="text/javascript"></script>
<link type="text/css" rel="stylesheet" href="css/reset.css" /> <link type="text/css" rel="stylesheet" href="css/reset.css" />
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
<script type="text/javascript" src="common/js/script.js"></script> <script type="text/javascript" src="common/js/script.js"></script>
<style> <style>
html, body{ html{
-ms-touch-action : none !important; -ms-touch-action : none;
} }
</style> </style>
...@@ -349,5 +349,6 @@ ...@@ -349,5 +349,6 @@
<iframe style="height:0px;width:0px;visibility:hidden" src="about:blank"> <iframe style="height:0px;width:0px;visibility:hidden" src="about:blank">
this frame prevents back forward cache this frame prevents back forward cache
</iframe> </iframe>
</body> </body>
</html> </html>
\ No newline at end of file
abvw/css/setting.css
...@@ -76,13 +76,14 @@ article{ ...@@ -76,13 +76,14 @@ article{
section{ section{
width:800px; width:800px;
display:block; display:block;
padding:33px 0 0; /*padding:33px 0 0;*/
padding:23px 0 0;
margin:0 auto; margin:0 auto;
overflow:hidden; overflow:hidden;
} }
section div#user_info{ section div#user_info{
margin-bottom:40px; margin-bottom:30px;
} }
section div#user_info h2{ section div#user_info h2{
...@@ -166,7 +167,7 @@ section div#user_info .passchgbtn a:hover:not(:target) { ...@@ -166,7 +167,7 @@ section div#user_info .passchgbtn a:hover:not(:target) {
div#user_option{ div#user_option{
width:inherit; width:inherit;
height:415px; /*height:415px;*/
background:url(../img/common/back_dot.gif); background:url(../img/common/back_dot.gif);
-moz-border-radius:6px; -moz-border-radius:6px;
-webkit-border-radius:6px; -webkit-border-radius:6px;
...@@ -174,7 +175,8 @@ div#user_option{ ...@@ -174,7 +175,8 @@ div#user_option{
} }
div#user_option h3{ div#user_option h3{
padding:25px 0 0 0; /*padding:25px 0 0 0;*/
padding:20px 0 0 0;
margin:0 0 8px 30px; margin:0 0 8px 30px;
font-size:14px; font-size:14px;
font-weight:bold; font-weight:bold;
...@@ -241,7 +243,7 @@ section div#user_option input { ...@@ -241,7 +243,7 @@ section div#user_option input {
} }
section div#user_option .backupbtn { section div#user_option .backupbtn {
margin:0 0 35px 30px; margin:0 0 20px 30px;
} }
section div#user_option .backupbtn a { section div#user_option .backupbtn a {
width:125px; width:125px;
...@@ -292,7 +294,7 @@ section div#user_option .backupbtn a:hover:not(:target) { ...@@ -292,7 +294,7 @@ section div#user_option .backupbtn a:hover:not(:target) {
} }
section #user_option .savebtn{ section #user_option .savebtn{
padding:30px 0 0 30px; padding:20px 0 0 20px;
border-top:1px solid #CCC; border-top:1px solid #CCC;
} }
...@@ -601,4 +603,31 @@ section h1{ ...@@ -601,4 +603,31 @@ section h1{
{ {
font-size: large; font-size: large;
font-family: 'trebuchet ms', verdana, arial; font-family: 'trebuchet ms', verdana, arial;
}
/* No.4 */
#cboAnimation
{
margin-left:120px;
}
.lblOptPageTransPeriod
{
padding-left:20px;
}
#txtValueAnimation
{
width:30px;
border:solid 1px #222;
text-align:center;
}
#slidebar-animation
{
display:inline-block;
width:200px;
margin:0 8px;
}
#slidebar-container
{
display:inline-block;
padding:0 5px;
} }
\ No newline at end of file
abvw/js/contentsearch.js
...@@ -821,7 +821,7 @@ function downloadResourceById(contentId){ ...@@ -821,7 +821,7 @@ function downloadResourceById(contentId){
//Download resource //Download resource
function getResourceByIdFromAPI(resourceId){ function getResourceByIdFromAPI(resourceId){
return getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + resourceId; return getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + resourceId + "&isDownload=true";
}; };
/* get url */ /* get url */
......
abvw/js/contentview_Anket.js 0 → 100644
function showAnket(url){
var $container = $('#dialog');
$container.html('');
$container.attr('style', 'background-color: white; position: absolute; top: 0% !important; height: 100% !important;width: 25% !important; opacity: 0.85');
$container.draggable({ handle: "h1" });
$container.html(
'<h1 style="height:25px;background:url(./img/viewer/pophdbg.png) 0 0 repeat; ">'
+ '<img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnClose" class="align_right" ></img>'
+ '</h1>'
+ '<iframe src="'+ url +'" style="position: absolute; width: 100%; height: 95%; ">'
+ '</iframe>'
);
$('#dialog h1 img').click(function(){
$container.removeAttr('style');
hideDialog();
});
};
\ No newline at end of file
abvw/js/contentview_CallApi.js
...@@ -115,6 +115,14 @@ function getDataJsonFile() { ...@@ -115,6 +115,14 @@ function getDataJsonFile() {
else if (JsonFile.horizontal) { else if (JsonFile.horizontal) {
if (JsonFile.horizontal.pages) { if (JsonFile.horizontal.pages) {
pageObjectsData = JsonFile.horizontal.pages; pageObjectsData = JsonFile.horizontal.pages;
//Start Function : No.9 - Editor : Long - Date : 08/16/2013 - Summary :
if(data.contentDataSub != null && data.contentDataSub.length > 0){
for(var i = 0; i < pageObjectsData.length; i++){
var obj = pageObjectsData[i];
obj["contentDataSub"] = data.contentDataSub;
}
}
//End Function : No.9 - Editor : Long - Date : 08/16/2013 - Summary :
} }
} }
...@@ -167,7 +175,6 @@ function loadDataBookmark(lstPageNo) { ...@@ -167,7 +175,6 @@ function loadDataBookmark(lstPageNo) {
} }
}; };
/* get data using for search */ /* get data using for search */
function getSearchDataFromJson() { function getSearchDataFromJson() {
//get data from JSON file //get data from JSON file
......
abvw/js/contentview_General.js
...@@ -112,6 +112,8 @@ var ContentTypeKeys = { ...@@ -112,6 +112,8 @@ var ContentTypeKeys = {
}; };
var contentType; var contentType;
var imageTypeData;
var nextPageImage = ''; var nextPageImage = '';
var nextPageObjects = []; var nextPageObjects = [];
var nextContent = new Content(); var nextContent = new Content();
...@@ -119,11 +121,12 @@ var prevPageObjects = []; ...@@ -119,11 +121,12 @@ var prevPageObjects = [];
var prevPageImage = ''; var prevPageImage = '';
var prevContent = new Content(); var prevContent = new Content();
var animateTypeKeys = { var animateTypeKeys = {
Type_Slide : 'slide', Type_Slide : 0,
Type_FadeIn : 'fade' Type_FadeIn : 1
}; };
var animateType = animateTypeKeys.Type_Slide; var animateType;
var animatePeriod;
function getNextContent(){ function getNextContent(){
return nextContent; return nextContent;
...@@ -361,6 +364,8 @@ function enableAllControl() { ...@@ -361,6 +364,8 @@ function enableAllControl() {
$("#slider_page").slider("option", "disabled", false); $("#slider_page").slider("option", "disabled", false);
enable('#txtSearch', '#txtSlider'); enable('#txtSearch', '#txtSlider');
} }
if (avwUserEnvObj.os != "ipad" && avwUserEnvObj.os != "android") { if (avwUserEnvObj.os != "ipad" && avwUserEnvObj.os != "android") {
$('#button_next_canvas').css('display', 'block'); $('#button_next_canvas').css('display', 'block');
$('#button_pre_canvas').css('display', 'block'); $('#button_pre_canvas').css('display', 'block');
......
abvw/js/contentview_InitObjects.js
...@@ -125,9 +125,7 @@ function initPage() { ...@@ -125,9 +125,7 @@ function initPage() {
$('#footer_toolbar_1').show(); $('#footer_toolbar_1').show();
/* init pos bottom toolbar*/ /* init pos bottom toolbar*/
initDisplayToolbarDevice(); initDisplayToolbarDevice();
// Lock screen // Lock screen
LockScreen(); LockScreen();
...@@ -146,6 +144,10 @@ function initPage() { ...@@ -146,6 +144,10 @@ function initPage() {
} }
else{ else{
getJsonContentInfo(); getJsonContentInfo();
//Start Function: No.4 - Editor : Long - Date: 08/20/2013
getPageTransitionConfig();
//End Function : No.4 - Editor : Long - Date : 08/20/2013
} }
//End Function: No.12 //End Function: No.12
...@@ -270,13 +272,14 @@ function initPage() { ...@@ -270,13 +272,14 @@ function initPage() {
getContent().setPageImages(totalPage, pageImages) getContent().setPageImages(totalPage, pageImages)
.setPageObjects(pageObjects) .setPageObjects(pageObjects)
.setUpPage(0); .setUpPage(0);
//Start Function: No.12 - Editor : Long - Summary : Render next page //Start Function: No.12 - Editor : Long - Summary : Render next page
//Get next //Get next
getNextPageObjectsByPageIndex(pageObjectsData, getPageIndex() + 1); getNextPageObjectsByPageIndex(pageObjectsData, getPageIndex() + 1);
//Render next page //Render next page
renderNextPage(); renderNextPage();
//End Function: No.12 - Editor : Long - Summary : Render next page //End Function: No.12 - Editor : Long - Summary : Render next page
/* set pageTitle*/ /* set pageTitle*/
...@@ -410,6 +413,12 @@ function initPageMediaAndHtmlType(){ ...@@ -410,6 +413,12 @@ function initPageMediaAndHtmlType(){
handleSliderBar(); handleSliderBar();
$('#lblSlider').text('/ ' + 1); $('#lblSlider').text('/ ' + 1);
if (avwUserEnvObj.os != "android") {
$("#slider_page").slider("option", "disabled", true);
}
disable('#txtSearch', '#txtSlider');
}; };
...@@ -443,14 +452,14 @@ function initializeViewerComponent(viewId) { ...@@ -443,14 +452,14 @@ function initializeViewerComponent(viewId) {
{ {
'position': 'absolute', 'position': 'absolute',
'height' : '100%', 'height' : '100%',
'width' : '100%' 'width' : '100%',
'left': '0px'
} }
); );
$('#main').css( $('#main').css(
{ {
'position': 'absolute', 'position': 'absolute',
'top': marginY + 'px', 'top': marginY + 'px',
'left': marginX + 'px', 'left': marginX + 'px',
...@@ -470,7 +479,8 @@ function initializeViewerComponent(viewId) { ...@@ -470,7 +479,8 @@ function initializeViewerComponent(viewId) {
'left': marginX + 'px', 'left': marginX + 'px',
'box-shadow': '3px 3px 14px #333', 'box-shadow': '3px 3px 14px #333',
'background-color': 'rgba(153, 153, 153, 0.7)', 'background-color': 'rgba(153, 153, 153, 0.7)',
'border-radius': '4px' 'border-radius': '4px',
'display': 'none'
} }
); );
$('#mainPre').css( $('#mainPre').css(
...@@ -481,7 +491,8 @@ function initializeViewerComponent(viewId) { ...@@ -481,7 +491,8 @@ function initializeViewerComponent(viewId) {
'left': marginX + 'px', 'left': marginX + 'px',
'box-shadow': '3px 3px 14px #333', 'box-shadow': '3px 3px 14px #333',
'background-color': 'rgba(153, 153, 153, 0.7)', 'background-color': 'rgba(153, 153, 153, 0.7)',
'border-radius': '4px' 'border-radius': '4px',
'display': 'none'
} }
); );
} }
......
abvw/js/detail.js
...@@ -50,7 +50,6 @@ $(document).ready(function () { ...@@ -50,7 +50,6 @@ $(document).ready(function () {
//openContentDetail(); //openContentDetail();
}); });
...@@ -214,15 +213,16 @@ function contentdetail_dspRead_Click(e) { ...@@ -214,15 +213,16 @@ function contentdetail_dspRead_Click(e) {
//$('body,html').animate({ scrollTop: 0 }, 0); //$('body,html').animate({ scrollTop: 0 }, 0);
ClientData.IsRefresh(false); ClientData.IsRefresh(false);
var contentType = "1"; //var contentType = "1";
if(contentType == "1"){
if(ClientData.contentInfo_contentType() == ContentTypeKeys.Type_Others){
// Get content detail // Get content detail
avwCmsApi(ClientData.userInfo_accountPath(), "webGetContent", "GET", { contentId: ClientData.contentInfo_contentId(), sid: ClientData.userInfo_sid(), getType: 2 }, avwCmsApi(ClientData.userInfo_accountPath(), "webGetContent", "GET", { contentId: ClientData.contentInfo_contentId(), sid: ClientData.userInfo_sid(), getType: 2 },
function (data) { function (data) {
$.each(data.contentData , function(i, n){ $.each(data.contentData , function(i, n){
if(typeof n == "object"){ if(typeof n == "object"){
resourceIdDetail = n.resourceId; resourceIdDetail = n.resourceId;
window.location.href = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + resourceIdDetail; window.open(getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + resourceIdDetail + "&isDownload=true", "_self");
} }
}); });
......
abvw/js/header.js
...@@ -760,6 +760,10 @@ function initPushMessage() ...@@ -760,6 +760,10 @@ function initPushMessage()
$('#list-push-message').click( $('#list-push-message').click(
function (e) { function (e) {
$('#liPushMessage').removeClass('show').addClass('hide');
$('#list-push-message').slideUp();
e.stopPropagation(); e.stopPropagation();
return false; return false;
} }
......
abvw/js/history.js
...@@ -711,7 +711,7 @@ function downloadResourceById(contentId){ ...@@ -711,7 +711,7 @@ function downloadResourceById(contentId){
//Download resource //Download resource
function getResourceByIdFromAPI(resourceId){ function getResourceByIdFromAPI(resourceId){
return getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + resourceId; return getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + resourceId + "&isDownload=true";
}; };
/* get url */ /* get url */
......
abvw/js/login.js
...@@ -55,7 +55,16 @@ function initialScreen() { ...@@ -55,7 +55,16 @@ function initialScreen() {
//check Save Login Info //check Save Login Info
function saveLoginInfo() { function saveLoginInfo() {
SessionStorageUtils.login();
//clear session of old user
SessionStorageUtils.clear();
avwUserSessionObj = null;
// create new session for anonymous user
avwCreateUserSession();
//SessionStorageUtils.login();
// Set flag コンテンツデータチェックフラグ = true to sync local with server // Set flag コンテンツデータチェックフラグ = true to sync local with server
ClientData.common_contentDataChkFlg(true); ClientData.common_contentDataChkFlg(true);
...@@ -575,7 +584,7 @@ function initLoginAnonymousUser() { ...@@ -575,7 +584,7 @@ function initLoginAnonymousUser() {
urlpath: sysSettings.anonymousLoginPath urlpath: sysSettings.anonymousLoginPath
}; };
avwCmsApiWithUrl(sysSettings.apiLoginUrl, null, 'webClientAnonymousLogin', 'post', params, function (data) { avwCmsApiWithUrl(sysSettings.apiLoginUrl, null, 'webClientAnonymousLogin', 'post', params, function (data) {
if (data.result == 'success') { if (data.result == 'success') {
//clear session of old anonymous user //clear session of old anonymous user
...@@ -600,25 +609,54 @@ function initLoginAnonymousUser() { ...@@ -600,25 +609,54 @@ function initLoginAnonymousUser() {
// clear all local storage data of old anonymous // clear all local storage data of old anonymous
LocalStorageUtils.clear(); LocalStorageUtils.clear();
// set number new push message to 0
ClientData.pushInfo_newMsgNumber(0);
// get service option list
optionList = data.serviceOptionList;
// save service user option
$.each(data.serviceOptionList, function (i, option) {
if (option.serviceName == 'marking') {
ClientData.serviceOpt_marking(option.value);
}
});
// hide splash screen then move to home page // hide splash screen then move to home page
$('#splashscreen').fadeOut('slow', 'swing', function () { $('#splashscreen').fadeOut('slow', 'swing', function () {
avwScreenMove("abvw/" + ScreenIds.Home); avwScreenMove("abvw/" + ScreenIds.Home);
}); });
} }
else { else {
showMessageErrorLoginAnonymous(); if (data.errorMessage != null && data.errorMessage != undefined) {
showMessageErrorLoginAnonymous(format(i18nText('msgAnonymousLoginErr'), data.errorMessage).toString());
}
else {
showMessageErrorLoginAnonymous(i18nText('msgAnonymousLoginErr2'));
}
} }
}, function (xhr, statusText, errorThrown) { }, function (xhr, statusText, errorThrown) {
showMessageErrorLoginAnonymous(); if (xhr.responseText && xhr.status != 0) {
var errorMessage = JSON.parse(xhr.responseText).errorMessage;
if (errorMessage) {
showMessageErrorLoginAnonymous(format(i18nText('msgAnonymousLoginErr'), errorMessage).toString());
}
else {
showMessageErrorLoginAnonymous(i18nText('msgAnonymousLoginErr2'));
}
} else {
showMessageErrorLoginAnonymous(i18nText('msgAnonymousLoginErr2'));
}
}); });
}; };
function showMessageErrorLoginAnonymous() { function showMessageErrorLoginAnonymous(errorMessage) {
$().toastmessage({ position: 'middle-center' }); $().toastmessage({ position: 'middle-center' });
$().toastmessage('showToast', { $().toastmessage('showToast', {
type: 'error', type: 'error',
sticky: true, sticky: true,
text:i18nText('msgAnonymousLoginErr') text: errorMessage
}); });
$('.toast-position-middle-center').css('width', '400px'); $('.toast-position-middle-center').css('width', '400px');
}; };
\ No newline at end of file
abvw/js/settings.js
...@@ -676,6 +676,23 @@ function dspSave_Click(e) { ...@@ -676,6 +676,23 @@ function dspSave_Click(e) {
ClientData.userOpt_bkShioriFlag(0); ClientData.userOpt_bkShioriFlag(0);
} }
// save config page transition No.4
ClientData.userOpt_pageTransition($('#cboAnimation').val());
var timeAnimation = $('#txtValueAnimation').val();
if (isNaN(timeAnimation) || timeAnimation < 0.1 || timeAnimation.length == 2 || timeAnimation.length > 3 || timeAnimation.indexOf('.')==0) {
timeAnimation = 0.1;
}
else if (timeAnimation > 9.9) {
timeAnimation = 9.9;
}
ClientData.userOpt_pageTransitionPeriod(timeAnimation);
$('#txtValueAnimation').val(timeAnimation);
/* show messages */ /* show messages */
$().toastmessage({ position: 'middle-center' }); $().toastmessage({ position: 'middle-center' });
$().toastmessage('showToast', { $().toastmessage('showToast', {
...@@ -751,6 +768,11 @@ function dspOptReset_Click(e) { ...@@ -751,6 +768,11 @@ function dspOptReset_Click(e) {
// set default backup bookmark // set default backup bookmark
$('#chkBkShiori').attr('checked', 'checked'); $('#chkBkShiori').attr('checked', 'checked');
// reset page transition no.4
$('#txtValueAnimation').val(1);
$('#cboAnimation').val(0);
$('#slidebar-animation').slider('value', 1);
}; };
// Backup // Backup
...@@ -1142,4 +1164,39 @@ function InitScreen() { ...@@ -1142,4 +1164,39 @@ function InitScreen() {
else { else {
$("#chkBkShiori").attr('checked', 'checked'); $("#chkBkShiori").attr('checked', 'checked');
} }
// load config page transition & page transition period No.4
$('#cboAnimation').val(ClientData.userOpt_pageTransition());
$('#txtValueAnimation').val(ClientData.userOpt_pageTransitionPeriod());
$('#txtValueAnimation').blur(function () {
var value = $(this).val();
if (isNaN(value) || value < 0.1 || value.length == 2 || value.length > 3 || value.indexOf('.') == 0) {
value = 0.1;
}
else if (value > 9.9) {
value = 9.9;
}
$(this).val(value);
$('#slidebar-animation').slider('value', value);
});
$('#slidebar-animation').slider(
{
min: 0.1,
max: 9.9,
step: 0.1,
value: $('#txtValueAnimation').val(),
slide: doChangeAnimationSlidebar
}
);
}; };
function doChangeAnimationSlidebar(e,obj) {
$('#txtValueAnimation').val(obj.value);
};
\ No newline at end of file
abvw/settings.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=9,chrome=1" /> <meta http-equiv="X-UA-Compatible" content="IE=9,10,chrome=1" />
<meta http-equiv="Pragma" content="no-cache"> <meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Cache-Control" content="no-store"> <meta http-equiv="Cache-Control" content="no-store">
<meta http-equiv="Cache-Control" content="no-cache"> <meta http-equiv="Cache-Control" content="no-cache">
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<script src="./common/js/jquery-1.8.1.min.js"></script> <script src="./common/js/jquery-1.8.1.min.js"></script>
<script src="./common/js/jquery-ui-1.8.23.custom.min.js"></script> <script src="./common/js/jquery-ui-1.8.23.custom.min.js"></script>
<script src="./common/js/jquery.ui.touch-punch.min.js"></script>
<script src="./common/js/jquery.toastmessage.js"></script> <script src="./common/js/jquery.toastmessage.js"></script>
<script src="./common/js/avweb.js"></script> <script src="./common/js/avweb.js"></script>
<script src="./common/js/i18n.js"></script> <script src="./common/js/i18n.js"></script>
...@@ -32,7 +33,11 @@ ...@@ -32,7 +33,11 @@
<script src="js/header.js" type="text/javascript"></script> <script src="js/header.js" type="text/javascript"></script>
<script src="js/settings.js" type="text/javascript"></script> <script src="js/settings.js" type="text/javascript"></script>
<style>
html{
-ms-touch-action : none;
}
</style>
<!--[if gte IE 9]> <!--[if gte IE 9]>
<style type="text/css"> <style type="text/css">
...@@ -127,6 +132,20 @@ ...@@ -127,6 +132,20 @@
<li><label><input type=checkbox name="repeat" value="repeat" class="chkbx" id="chkOpt002" checked="checked" /><label for="chkOpt002" id="txtOpt002" lang="txtOpt002" class="lang">動画、音楽繰り返し</label></label></li> <li><label><input type=checkbox name="repeat" value="repeat" class="chkbx" id="chkOpt002" checked="checked" /><label for="chkOpt002" id="txtOpt002" lang="txtOpt002" class="lang">動画、音楽繰り返し</label></label></li>
<li><label><input type=checkbox name="marking" value="marking" class="chkbx" id="chkOpt003" checked="checked" /><label id="lblOpt003" for="chkOpt003" lang="txtOpt003" class="lang">マーキング（コンテンツを開いた時に表示する）</label></label><span class="notice lang" lang="txtOpt004" >※コンテンツを開いた時に表示する</span></li> <li><label><input type=checkbox name="marking" value="marking" class="chkbx" id="chkOpt003" checked="checked" /><label id="lblOpt003" for="chkOpt003" lang="txtOpt003" class="lang">マーキング（コンテンツを開いた時に表示する）</label></label><span class="notice lang" lang="txtOpt004" >※コンテンツを開いた時に表示する</span></li>
<li><label><input type=checkbox name="confirmClose" value="confirmClose" class="chkbx" id="chkOpt005" checked="checked" /><label for="chkOpt005" id="txtOpt005" lang="txtOpt005" class="lang">タブ・ブラウザ終了・F5時のアラートが表示する</label></label></li> <li><label><input type=checkbox name="confirmClose" value="confirmClose" class="chkbx" id="chkOpt005" checked="checked" /><label for="chkOpt005" id="txtOpt005" lang="txtOpt005" class="lang">タブ・ブラウザ終了・F5時のアラートが表示する</label></label></li>
<li>
<label lang="txtOptPageTrans" class="lang">ビューのアニメーション種類</label>
<select id="cboAnimation">
<option class="lang" lang="txtOptPageTransSlide" value="0">スライド</option>
<option class="lang" lang="txtOptPageTransFade" value="1">フェード</option>
<!--<option class="lang" lang="txtOptPageTransRev" value="2">リヴェール＆ムーブイン</option>-->
</select>
</li>
<li>
<label class="lang lblOptPageTransPeriod" lang="txtOptPageTransPeriod">アニメーション時間(Sec)</label>
<input type="text" id="txtValueAnimation" value="1.0" />
<span id="slidebar-container"><span id="slidebar-from">0.1</span><span id="slidebar-animation"></span><span id="slidebar-to">9.9</span></span>
</li>
</ul> </ul>
<h3 id="txtBkResCap" lang="txtBkResCap" class="lang">サーバにバックアップ/リストア</h3> <h3 id="txtBkResCap" lang="txtBkResCap" class="lang">サーバにバックアップ/リストア</h3>
<p class="logout_backup" id="regionOptionBackup"><label><input type=checkbox name="backup" value="backup" id="chkOptBkCfm" checked="checked"><label id="txtOptBkCfm" for="chkOptBkCfm" lang="txtOptBkCfm" class="lang">毎回ログアウトの時、バックアップするかどうかは必ず確認する</label></label> <p class="logout_backup" id="regionOptionBackup"><label><input type=checkbox name="backup" value="backup" id="chkOptBkCfm" checked="checked"><label id="txtOptBkCfm" for="chkOptBkCfm" lang="txtOptBkCfm" class="lang">毎回ログアウトの時、バックアップするかどうかは必ず確認する</label></label>
...@@ -140,7 +159,7 @@ ...@@ -140,7 +159,7 @@
</p> </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="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></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>
</div> </div>
</section> </section>
</article> </article>
......
login.html
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</dl> </dl>
<dl> <dl>
<dt class="lang" lang="txtLoginPwd">パスワード：</dt> <dt class="lang" lang="txtLoginPwd">パスワード：</dt>
<dd><input type="password" id="txtPassword" maxlength="10"/></dd> <dd><input type="password" id="txtPassword"/></dd>
</dl> </dl>
<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>
<p class="loginbtn"><a id="btnLogin" class="lang" lang="dspLogin">ログイン</a></p> <p class="loginbtn"><a id="btnLogin" class="lang" lang="dspLogin">ログイン</a></p>
......
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