Skip to content

C
check
Commit d9a5f33d by Masaru Abe
Options

テスト対応

parent f914d975
Showing with 53 additions and 6 deletions
abvw/js/bookmark.js
...@@ -13,8 +13,11 @@ BOOKMARK.bookmark_errorContent = []; ...@@ -13,8 +13,11 @@ BOOKMARK.bookmark_errorContent = [];
// Contain contents // Contain contents
BOOKMARK.collection_contents = []; BOOKMARK.collection_contents = [];
//ソート条件復帰
BOOKMARK.searchDivision = 1; BOOKMARK.searchDivision = 1;
BOOKMARK.sortType = 2; BOOKMARK.sortType = 2;
//スクロール復帰
BOOKMARK.scrollTop = 0;
// Init function of page // Init function of page
$(document).ready(function () { $(document).ready(function () {
...@@ -711,17 +714,17 @@ BOOKMARK.insertRow = function(contentid, pageThumbnail, pageTitle, pageText, pag ...@@ -711,17 +714,17 @@ BOOKMARK.insertRow = function(contentid, pageThumbnail, pageTitle, pageText, pag
imgTemp.src = pageThumbnail; imgTemp.src = pageThumbnail;
if (hasMemo) { if (hasMemo) {
newRow += '<li><a href="#" style="cursor: default;">' + imgMemo + '</a></li>'; newRow += '<li><a href="javascript:void(0);" style="cursor: default;">' + imgMemo + '</a></li>';
} }
else { else {
newRow += '<li><a href="#" style="cursor: default;">' + imgMemoHide + '</a></li>'; newRow += '<li><a href="javascript:void(0);" style="cursor: default;">' + imgMemoHide + '</a></li>';
} }
if (hasMarking) { if (hasMarking) {
newRow += '<li><a href="#" style="cursor: default;">' + imgMarking + '</a></li>'; newRow += '<li><a href="javascript:void(0);" style="cursor: default;">' + imgMarking + '</a></li>';
} }
else { else {
newRow += '<li><a href="#" style="cursor: default;">' + imgMarkingHide + '</a></li>'; newRow += '<li><a href="javascript:void(0);" style="cursor: default;">' + imgMarkingHide + '</a></li>';
} }
...@@ -1064,6 +1067,11 @@ Setting dialog [ end ] ...@@ -1064,6 +1067,11 @@ Setting dialog [ end ]
BOOKMARK.showContentView = function(){ BOOKMARK.showContentView = function(){
var y = document.documentElement.scrollTop || document.body.scrollTop;
BOOKMARK.scrollTop = y;
//TOPに戻す
document.documentElement.scrollTop = 0;
//試験 //試験
$("#header-ws").hide(); $("#header-ws").hide();
$("#ws-body").hide(); $("#ws-body").hide();
......
abvw/js/contentsearch.js
...@@ -22,6 +22,9 @@ CONTENTSEARCH.chkSearchTextEmpty = false; ...@@ -22,6 +22,9 @@ CONTENTSEARCH.chkSearchTextEmpty = false;
CONTENTSEARCH.noRecordFlg = false; CONTENTSEARCH.noRecordFlg = false;
CONTENTSEARCH.home_isMove = false; CONTENTSEARCH.home_isMove = false;
//スクロール復帰
CONTENTSEARCH.scrollTop = 0;
$(document).ready(function(){ $(document).ready(function(){
if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)){ if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)){
...@@ -1414,6 +1417,11 @@ CONTENTSEARCH.showContentShareDlgFunction = function(e) { ...@@ -1414,6 +1417,11 @@ CONTENTSEARCH.showContentShareDlgFunction = function(e) {
CONTENTSEARCH.showContentView = function(){ CONTENTSEARCH.showContentView = function(){
var y = document.documentElement.scrollTop || document.body.scrollTop;
CONTENTSEARCH.scrollTop = y;
//TOPに戻す
document.documentElement.scrollTop = 0;
//試験 //試験
$("#header-ws").hide(); $("#header-ws").hide();
$("#ws-body").hide(); $("#ws-body").hide();
......
abvw/js/contentview.js
...@@ -5544,27 +5544,38 @@ CONTENTVIEW.screenBack = function(){ ...@@ -5544,27 +5544,38 @@ CONTENTVIEW.screenBack = function(){
$("#ws-body").show(); $("#ws-body").show();
$("#topcontrol").show(); $("#topcontrol").show();
document.title = I18N.i18nText('dspHome') + ' | ' + I18N.i18nText('sysAppTitle'); document.title = I18N.i18nText('dspHome') + ' | ' + I18N.i18nText('sysAppTitle');
//元の位置に戻す
document.documentElement.scrollTop = HOME.scrollTop;
} else if( $('#bookmark').length ){ } else if( $('#bookmark').length ){
BOOKMARK.cssInit(); BOOKMARK.cssInit();
$("#header-ws").show(); $("#header-ws").show();
$("#ws-body").show(); $("#ws-body").show();
$("#topcontrol").show(); $("#topcontrol").show();
document.title = I18N.i18nText('dspShiori') + ' | ' + I18N.i18nText('sysAppTitle'); document.title = I18N.i18nText('dspShiori') + ' | ' + I18N.i18nText('sysAppTitle');
//元の位置に戻す
document.documentElement.scrollTop = BOOKMARK.scrollTop;
BOOKMARK.refreshView(); BOOKMARK.refreshView();
} else if( $('#history').length ){ } else if( $('#history').length ){
HISTORY.cssInit(); HISTORY.cssInit();
$("#header-ws").show(); $("#header-ws").show();
$("#ws-body").show(); $("#ws-body").show();
$("#topcontrol").show(); $("#topcontrol").show();
document.title = I18N.i18nText('dspViewHistory') + ' | ' + I18N.i18nText('sysAppTitle'); document.title = I18N.i18nText('dspViewHistory') + ' | ' + I18N.i18nText('sysAppTitle');
//元の位置に戻す
document.documentElement.scrollTop = HISTORY.scrollTop;
} else if( $('#contentsearch').length ){ } else if( $('#contentsearch').length ){
CONTENTSEARCH.cssInit(); CONTENTSEARCH.cssInit();
$("#header-ws").show(); $("#header-ws").show();
$("#ws-body").show(); $("#ws-body").show();
$("#topcontrol").show(); $("#topcontrol").show();
document.title = I18N.i18nText('txtSearchResult') + ' | ' + I18N.i18nText('sysAppTitle'); document.title = I18N.i18nText('txtSearchResult') + ' | ' + I18N.i18nText('sysAppTitle');
//元の位置に戻す
document.documentElement.scrollTop = CONTENTSEARCH.scrollTop;
} }
//プッシュメッセージ再開 //プッシュメッセージ再開
// check new push message // check new push message
......
abvw/js/contentview_Memo.js
...@@ -144,6 +144,9 @@ CONTENTVIEW_MEMO.MemoCancelFunction = function(){ ...@@ -144,6 +144,9 @@ CONTENTVIEW_MEMO.MemoCancelFunction = function(){
}; };
CONTENTVIEW_MEMO.AddMemo = function(contentId,pageNo,targetId, posX, posY, callback) { CONTENTVIEW_MEMO.AddMemo = function(contentId,pageNo,targetId, posX, posY, callback) {
//console.log("CONTENTVIEW_MEMO.AddMemo:" + posX + "," + posY);
CONTENTVIEW_MEMO.conid = contentId; CONTENTVIEW_MEMO.conid = contentId;
CONTENTVIEW_MEMO.pageid = pageNo; CONTENTVIEW_MEMO.pageid = pageNo;
CONTENTVIEW_MEMO.targetDiv = targetId; CONTENTVIEW_MEMO.targetDiv = targetId;
......
abvw/js/detail.js
...@@ -50,7 +50,9 @@ DETAIL.openContentDetail = function() { ...@@ -50,7 +50,9 @@ DETAIL.openContentDetail = function() {
$("#txtPubDt2_Dsp").text(''); $("#txtPubDt2_Dsp").text('');
$("#txtContentDetail").text(''); $("#txtContentDetail").text('');
$("#contentDetailClose").unbind("click");
$("#contentDetailClose").click(DETAIL.contentDetailClose_Click); $("#contentDetailClose").click(DETAIL.contentDetailClose_Click);
$("#contentdetail_dspRead").unbind("click");
$("#contentdetail_dspRead").click(DETAIL.contentdetail_dspRead_Click); $("#contentdetail_dspRead").click(DETAIL.contentdetail_dspRead_Click);
//if( ClientData.serviceOpt_content_share() != '2'){ //if( ClientData.serviceOpt_content_share() != '2'){
......
abvw/js/history.js
...@@ -23,6 +23,8 @@ HISTORY.contentViewData = []; ...@@ -23,6 +23,8 @@ HISTORY.contentViewData = [];
HISTORY.noRecordFlg = false; HISTORY.noRecordFlg = false;
HISTORY.home_isMove = false; HISTORY.home_isMove = false;
HISTORY.history_contentTitleKana = []; HISTORY.history_contentTitleKana = [];
//スクロール復帰
HISTORY.scrollTop = 0;
$(document).ready(function(){ $(document).ready(function(){
...@@ -1543,7 +1545,12 @@ HISTORY.showContentShareDlgFunction = function(e) { ...@@ -1543,7 +1545,12 @@ HISTORY.showContentShareDlgFunction = function(e) {
HISTORY.showContentView = function(){ HISTORY.showContentView = function(){
//試験 var y = document.documentElement.scrollTop || document.body.scrollTop;
//console.log("scrollTop:" + y);
HISTORY.scrollTop = y;
//TOPに戻す
document.documentElement.scrollTop = 0;
$("#header-ws").hide(); $("#header-ws").hide();
$("#ws-body").hide(); $("#ws-body").hide();
$("#topcontrol").hide(); $("#topcontrol").hide();
......
abvw/js/home.js
...@@ -39,6 +39,9 @@ HOME.timer_subMenu; ...@@ -39,6 +39,9 @@ HOME.timer_subMenu;
HOME.genre_totalcontent = -1; HOME.genre_totalcontent = -1;
HOME.group_totalcontent = -1; HOME.group_totalcontent = -1;
//スクロール復帰
HOME.scrollTop = 0;
//========================================================== //==========================================================
$(document).ready(function () { $(document).ready(function () {
...@@ -2762,6 +2765,11 @@ HOME.cssInit = function(){ ...@@ -2762,6 +2765,11 @@ HOME.cssInit = function(){
HOME.showContentView = function(){ HOME.showContentView = function(){
var y = document.documentElement.scrollTop || document.body.scrollTop;
HOME.scrollTop = y;
//TOPに戻す
document.documentElement.scrollTop = 0;
//試験 //試験
$("#header-ws").hide(); $("#header-ws").hide();
$("#ws-body").hide(); $("#ws-body").hide();
......
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