Skip to content

C
check
Commit b08b35ca by Masaru Abe
Options

テスト対応

parent d9a5f33d
Showing with 59 additions and 16 deletions
abvw/js/bookmark.js
...@@ -1067,10 +1067,21 @@ Setting dialog [ end ] ...@@ -1067,10 +1067,21 @@ Setting dialog [ end ]
BOOKMARK.showContentView = function(){ BOOKMARK.showContentView = function(){
var y = document.documentElement.scrollTop || document.body.scrollTop;
BOOKMARK.scrollTop = y;
//TOPに戻す //TOPに戻す
document.documentElement.scrollTop = 0; var y = 0
if( document.documentElement.scrollTop ){
y = document.documentElement.scrollTop;
}
if( document.body.scrollTop ){
if( y == undefined || y == 0){
y = document.body.scrollTop;
}
}
if( y == undefined || y == null){
y = 0;
}
BOOKMARK.scrollTop = y;
window.scrollTo(0,0);
//試験 //試験
$("#header-ws").hide(); $("#header-ws").hide();
......
abvw/js/contentsearch.js
...@@ -1417,10 +1417,21 @@ CONTENTSEARCH.showContentShareDlgFunction = function(e) { ...@@ -1417,10 +1417,21 @@ CONTENTSEARCH.showContentShareDlgFunction = function(e) {
CONTENTSEARCH.showContentView = function(){ CONTENTSEARCH.showContentView = function(){
var y = document.documentElement.scrollTop || document.body.scrollTop;
CONTENTSEARCH.scrollTop = y;
//TOPに戻す //TOPに戻す
document.documentElement.scrollTop = 0; var y = 0
if( document.documentElement.scrollTop ){
y = document.documentElement.scrollTop;
}
if( document.body.scrollTop ){
if( y == undefined || y == 0){
y = document.body.scrollTop;
}
}
if( y == undefined || y == null){
y = 0;
}
CONTENTSEARCH.scrollTop = y;
window.scrollTo(0,0);
//試験 //試験
$("#header-ws").hide(); $("#header-ws").hide();
......
abvw/js/contentview.js
...@@ -5544,8 +5544,9 @@ CONTENTVIEW.screenBack = function(){ ...@@ -5544,8 +5544,9 @@ 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');
//console.log("back HOME.scrollTop:" + HOME.scrollTop);
//元の位置に戻す //元の位置に戻す
document.documentElement.scrollTop = HOME.scrollTop; window.scrollTo(0,HOME.scrollTop);
} else if( $('#bookmark').length ){ } else if( $('#bookmark').length ){
BOOKMARK.cssInit(); BOOKMARK.cssInit();
...@@ -5554,7 +5555,7 @@ CONTENTVIEW.screenBack = function(){ ...@@ -5554,7 +5555,7 @@ CONTENTVIEW.screenBack = function(){
$("#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; window.scrollTo(0,BOOKMARK.scrollTop);
BOOKMARK.refreshView(); BOOKMARK.refreshView();
} else if( $('#history').length ){ } else if( $('#history').length ){
...@@ -5565,7 +5566,7 @@ CONTENTVIEW.screenBack = function(){ ...@@ -5565,7 +5566,7 @@ CONTENTVIEW.screenBack = function(){
$("#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; window.scrollTo(0,HISTORY.scrollTop);
} else if( $('#contentsearch').length ){ } else if( $('#contentsearch').length ){
CONTENTSEARCH.cssInit(); CONTENTSEARCH.cssInit();
...@@ -5574,7 +5575,7 @@ CONTENTVIEW.screenBack = function(){ ...@@ -5574,7 +5575,7 @@ CONTENTVIEW.screenBack = function(){
$("#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; window.scrollTo(0,CONTENTSEARCH.scrollTop);
} }
//プッシュメッセージ再開 //プッシュメッセージ再開
......
abvw/js/history.js
...@@ -1545,11 +1545,21 @@ HISTORY.showContentShareDlgFunction = function(e) { ...@@ -1545,11 +1545,21 @@ HISTORY.showContentShareDlgFunction = function(e) {
HISTORY.showContentView = function(){ HISTORY.showContentView = function(){
var y = document.documentElement.scrollTop || document.body.scrollTop; var y = 0
if( document.documentElement.scrollTop ){
y = document.documentElement.scrollTop;
}
if( document.body.scrollTop ){
if( y == undefined || y == 0){
y = document.body.scrollTop;
}
}
if( y == undefined || y == null){
y = 0;
}
//console.log("scrollTop:" + y); //console.log("scrollTop:" + y);
HISTORY.scrollTop = y; HISTORY.scrollTop = y;
//TOPに戻す window.scrollTo(0,0);
document.documentElement.scrollTop = 0;
$("#header-ws").hide(); $("#header-ws").hide();
$("#ws-body").hide(); $("#ws-body").hide();
......
abvw/js/home.js
...@@ -2765,10 +2765,20 @@ HOME.cssInit = function(){ ...@@ -2765,10 +2765,20 @@ HOME.cssInit = function(){
HOME.showContentView = function(){ HOME.showContentView = function(){
var y = document.documentElement.scrollTop || document.body.scrollTop; var y = 0
if( document.documentElement.scrollTop ){
y = document.documentElement.scrollTop;
}
if( document.body.scrollTop ){
if( y == undefined || y == 0){
y = document.body.scrollTop;
}
}
if( y == undefined || y == null){
y = 0;
}
HOME.scrollTop = y; HOME.scrollTop = y;
//TOPに戻す window.scrollTo(0,0);
document.documentElement.scrollTop = 0;
//試験 //試験
$("#header-ws").hide(); $("#header-ws").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