Skip to content

C
check
Commit 70fc78e7 by Masaru Abe
Options

OpenUri対応とストリーミング対応

parent d71a4fff
Showing with 115 additions and 2 deletions
abvw/common/js/common.js
...@@ -114,11 +114,11 @@ COMMON.ShortKeys = { ...@@ -114,11 +114,11 @@ COMMON.ShortKeys = {
COMMON.ScreenIds = { COMMON.ScreenIds = {
Login: './../login.html', Login: './../login.html',
Home : 'home.html?__UPDATEID__', Home : 'home.html?__UPDATEID__',
ContentView : 'contentview.html?__UPDATEID__',
Setting : 'settings.html?__UPDATEID__', Setting : 'settings.html?__UPDATEID__',
BookmarkList : 'bookmark.html?__UPDATEID__', BookmarkList : 'bookmark.html?__UPDATEID__',
ContentSearch : 'contentsearch.html?__UPDATEID__', ContentSearch : 'contentsearch.html?__UPDATEID__',
History: 'history.html?__UPDATEID__', History: 'history.html?__UPDATEID__',
ContentViewOpenUri : 'contentview_openuri.html?__UPDATEID__',
ContentViewStreaming : 'contentview_streaming.html?__UPDATEID__', ContentViewStreaming : 'contentview_streaming.html?__UPDATEID__',
ContentViewGetits : 'contentview_getits.html?__UPDATEID__' ContentViewGetits : 'contentview_getits.html?__UPDATEID__'
}; };
......
abvw/contentview_openuri.html 0 → 100644
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Cache-Control" content="no-store">
<meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1">
<meta name="viewport" content="">
<title></title>
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<!-- CSSビュー -->
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.ui.touch-punch.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.cookie.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/uuid.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_OpenUri.js?__UPDATEID__"></script>
<style>
html{
-ms-touch-action : none;
}
</style>
<script type="text/javascript">
$(document).ready(function() {
CONTENTVIEW_OPENURI.ready();
});
</script>
</head>
<body id="contentview_openuri" oncontextmenu="return false;">
<div id="ws-body" class="wrapper_ws" >
<div id="main-ws">
</div>
</div>
<div id="viewer" style="display:none;" >
</div>
<iframe style="height:0px;width:0px;visibility:hidden" src="about:blank">
this frame prevents back forward cache
</iframe>
</body>
</html>
\ No newline at end of file
abvw/js/contentview.js
...@@ -5424,6 +5424,10 @@ CONTENTVIEW.screenBack = function(){ ...@@ -5424,6 +5424,10 @@ CONTENTVIEW.screenBack = function(){
//元の位置に戻す //元の位置に戻す
window.scrollTo(0,CONTENTSEARCH.scrollTop); window.scrollTo(0,CONTENTSEARCH.scrollTop);
} else if( $('#contentview_openuri').length ){
//OpenUriで開いている場合
//ホームボタンと同じ動きにする
AVWEB.avwScreenMove(COMMON.ScreenIds.Home);
} }
//プッシュメッセージ再開 //プッシュメッセージ再開
if (COMMON.isAnonymousLogin() == false ) { if (COMMON.isAnonymousLogin() == false ) {
......
abvw/js/contentview_OpenUri.js 0 → 100644
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_OPENURI = {};
CONTENTVIEW_OPENURI.ready = function(){
//ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理
I18N.i18nReplaceText();
});
setTimeout(function(){
CONTENTVIEW_OPENURI.showContentView();
}, 200);
};
CONTENTVIEW_OPENURI.showContentView = function(){
$("#ws-body").hide();
//$("#topcontrol").hide();
CONTENTVIEW_INITOBJECT.clearViewerComponent();
CONTENTVIEW.cssInit();
$("#viewer").show();
CONTENTVIEW.ready();
};
$("document").ready(function () {
//CONTENTVIEW_OPENURI.ready();
});
abvw/js/login.js
...@@ -802,7 +802,7 @@ LOGIN.alertMessageOkFunction_callback = function(){ ...@@ -802,7 +802,7 @@ LOGIN.alertMessageOkFunction_callback = function(){
if (LOGIN.avwUserEnvObj.isMobile() && ClientData.isGetitsMode() ) { if (LOGIN.avwUserEnvObj.isMobile() && ClientData.isGetitsMode() ) {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentViewGetits); AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentViewGetits);
} else { } else {
AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentView); AVWEB.avwScreenMove("abvw/" + COMMON.ScreenIds.ContentViewOpenUri);
} }
}; };
//警告表示時のキャンセル処理 //警告表示時のキャンセル処理
......
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