Skip to content

C
check
Commit 4cd95f13 by Vo Duc Thang
Options

9/24 リリース 

https://redmine.agentec.jp/redmine/issues/9345#note-7
parent b80957f4
Showing with 214 additions and 78 deletions
abvw/bookmark.html
......@@ -147,7 +147,7 @@
<!--<a class="delete lang" id="dspDelete" lang="dspDelete">削除</a>-->
</section>
<div class="shioriNotExist lang" id="msgShioriNotExists" lang="msgShioriNotExists"></div>
<div style="display:none;" class="shioriNotExist lang" id="msgShioriNotExists" lang="msgShioriNotExists"></div>
<section id="bottom">
<a class="delete lang" id="dspDelete1" lang="dspDelete">削除</a>
</section>
......@@ -167,7 +167,7 @@
<footer>
<div class="border">
<div class="cnt_footer">
COPYRIGHT © 2012 株式会社Agentec ALL RIGHTS RESERVED.
COPYRIGHT © 2012 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
......
abvw/common/js/common.js
......@@ -2519,7 +2519,7 @@ function convertToDate(input) {
dateResult = new Date();
dateResult.setYear(nYear);
dateResult.setMonth(nMonth);
dateResult.setMonth(nMonth-1);
dateResult.setDate(nDay);
dateResult.setHours(nHour);
dateResult.setMinutes(nMinute);
......
abvw/common/js/scrolltopcontrol.js
......@@ -56,7 +56,7 @@ var scrolltotop={
mainobj.$body=(window.opera)? (document.compatMode=="CSS1Compat"? $('html') : $('body')) : $('html,body')
mainobj.$control=$('<div id="topcontrol">'+mainobj.controlHTML+'</div>')
.css({position:mainobj.cssfixedsupport? 'fixed' : 'absolute', bottom:mainobj.controlattrs.offsety, right:mainobj.controlattrs.offsetx, opacity:0, cursor:'pointer'})
.attr({title:'Scroll Back to Top'})
//.attr({title:'Scroll Back to Top'})
.click(function(){mainobj.scrollup(); return false})
.appendTo('body')
if (document.all && !window.XMLHttpRequest && mainobj.$control.text()!='') //loose check for IE6 and below, plus whether control contains any text
......
abvw/common/json/lang/lang-en.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"Logout",
"txtSearchResult":"Result",
"dspHome":"Home",
"txtLoginUser":"(Ver.20130920)User:",
"txtLoginUser":"(Ver.20130924)User:",
"txtAll":"All",
"txtMkgSize":"Size",
"txtMkgS":"S",
......@@ -146,5 +146,6 @@
"txtNoTransparent":"Opacity",
"txtContentPWTitle":"Password Confirm",
"txtContentPWMsg":"Please input password to view this content.",
"txtContentWarning":"Waring"
"txtContentWarning":"Warning",
"txtMediaAutoPlayWarning":"Media will be played automatically."
}
abvw/common/json/lang/lang-ja.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20130920)ログイン中：",
"txtLoginUser":"(Ver.20130924)ログイン中：",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......@@ -146,5 +146,6 @@
"txtNoTransparent":"不透明",
"txtContentPWTitle":"パスワードの確認",
"txtContentPWMsg":"閲覧するにはパスワードの入力が必要です。",
"txtContentWarning":"警告"
"txtContentWarning":"警告",
"txtMediaAutoPlayWarning":"メディアは自動再生されます。"
}
abvw/common/json/lang/lang-ko.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과",
"dspHome":"홈",
"txtLoginUser":"(Ver.20130920)로그인 중:",
"txtLoginUser":"(Ver.20130924)로그인 중:",
"txtAll":"전체",
"txtMkgSize":"두께",
"txtMkgS":"소",
......@@ -146,5 +146,6 @@
"txtNoTransparent":"KO_不透明",
"txtContentPWTitle":"KO_パスワードの確認",
"txtContentPWMsg":"KO_閲覧するにはパスワードの入力が必要です。",
"txtContentWarning":"KO_警告"
"txtContentWarning":"KO_警告",
"txtMediaAutoPlayWarning":"KO_メディアは自動再生されます。"
}
abvw/common/json/sys/conf.json
......@@ -6,7 +6,7 @@
"bookListCount" : 15,
"screenlockTimeDefault" : 30,
"pushPageCount" : 5,
"pushTimePeriod" : 6,
"pushTimePeriod" : 60,
"debug" : true,
"loginPage" : "index.html",
"anonymousLoginFlg" : false,
......
abvw/contentsearch.html
......@@ -189,7 +189,7 @@
<div id="content-grid">
</div>
<div id="msgSearchNotExist" class="lang" lang="msgSearchNotExist"> </div>
<div style="display:none;" id="msgSearchNotExist" class="lang" lang="msgSearchNotExist"> </div>
<br/>
<section style="height:110px; width:100%;">
<a class="btn_bott" id="control-nextrecord" style="visibility:hidden">次の15件を表示する >></a>
......@@ -218,7 +218,7 @@
<footer>
<div class="border">
<div class="cnt_footer">
COPYRIGHT © 2012 株式会社Agentec ALL RIGHTS RESERVED.
COPYRIGHT © 2012 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
......
abvw/contentview.html
......@@ -435,6 +435,18 @@
<p class="message lang" lang="msgBGMPlayConfirm" id="txtAudio_page">このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？</p>
<p class="deletebtn" ><a id="bgmConfirm_dspOK_page" lang="dspOK" class="ok_audio lang">ＯＫ</a></p>
</section>
<section id="contentVideoConfirm" class="sectionDeleteConfirm">
<h1 class="lang" lang=""> </h1>
<p class="message lang" lang="txtMediaAutoPlayWarning" id="txtContentVideo">Confirm Play Video</p>
<p class="deletebtn" ><a id="contentVideoConfirm_OK" lang="dspOK" class="ok_audio lang">ＯＫ</a></p>
</section>
<section id="contentAudioConfirm" class="sectionDeleteConfirm">
<h1 class="lang" lang=""> </h1>
<p class="message lang" lang="txtMediaAutoPlayWarning" id="txtContentAudio">Confirm Play Audio</p>
<p class="deletebtn" ><a id="contentAudioConfirm_OK" lang="dspOK" class="ok_audio lang">ＯＫ</a></p>
</section>
</div>
<iframe style="height:0px;width:0px;visibility:hidden" src="about:blank">
this frame prevents back forward cache
......
abvw/css/layout/setting.css
......@@ -98,12 +98,14 @@ article{
text-align: left;
}
.sectionSetting div#user_info dl dt, .sectionSetting div#user_info dl dd{
padding: 13px 20px;
padding: 0 20px;
margin: 0;
height:50px;
line-height:50px;
}
.sectionSetting div#user_info dl dt{
width: 160px;
float: left;
float: left;
}
.sectionSetting div#user_info dl dd{
width: 720px;
......
abvw/css/theme/viewer.css
......@@ -1397,4 +1397,5 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
background-position: -414px -92px;
}
ul#divSearchResult li:hover{ background:#f4f4f4;cursor:pointer;}
ul#divListBookmark li:hover{background:#f4f4f4;cursor:pointer;}
\ No newline at end of file
ul#divListBookmark li:hover{background:#f4f4f4;cursor:pointer;}
#divListIndex span:hover{color: red; cursor: pointer}
\ No newline at end of file
abvw/history.html
......@@ -187,7 +187,7 @@
<footer>
<div class="border">
<div class="cnt_footer">
COPYRIGHT © 2012 株式会社Agentec ALL RIGHTS RESERVED.
COPYRIGHT © 2012 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
......
abvw/home.html
......@@ -229,11 +229,10 @@
<div id="book_list"></div>
</section>
</article>
<footer>
<div class="border">
<div class="cnt_footer">
COPYRIGHT © 2012 株式会社Agentec ALL RIGHTS RESERVED.
COPYRIGHT © 2012 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
......
abvw/js/Limit_Access_Content.js
......@@ -84,6 +84,9 @@ function checkLimitContent(contentId, func,isNotUnlockScreen) {
//reset input password
$('#limit_level2 .message input').val('');
// hide error message
$('#lblMessageLimitError').hide();
// show dialog
$('#limit_level2').show().center();
......
abvw/js/contentview.js
......@@ -1056,7 +1056,7 @@ function changePage(page_index) {
.setPageObjects(pageObjects);
$('#divImageLoading').css('display', 'none');
//$('#divImageLoading').css('display', 'none');
var tran = new Transition();
tran.flipToPage(page_index);
......@@ -1914,6 +1914,8 @@ function resizeScreen() {
resizeAnket();
};
var isPendingContentBGM = false;
function changePageWithoutSlide(pageMove) {
disableAllControl();
var isExistBGMPageContent = false;
......@@ -1932,6 +1934,19 @@ function changePageWithoutSlide(pageMove) {
}
}
}
//START TRB00069
else{
getPageObjectsByPageIndex(pageObjectsData, 0);
for (var nIndex = 0; nIndex < pageObjects.length; nIndex++) {
if (pageObjects[nIndex].mediaType == '3' && pageObjects[nIndex].playType == '1') {
isPendingContentBGM = true;
if(pageMove > 0){
createAudio(pageObjects[nIndex].audioFile, pageObjects[nIndex].playType);
}
}
}
}
//END TRB00069
$('#divImageLoading').css('display', 'block');
......@@ -2107,7 +2122,7 @@ function handleForContentTypeVideo(resourceUrl){
$container.html(
'<h1>'
+ '</h1>'
+ '<video loop="true" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+ '<video autoplay="true" loop="true" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>'
);
......@@ -2116,15 +2131,35 @@ function handleForContentTypeVideo(resourceUrl){
$container.html(
'<h1>'
+ '</h1>'
+ '<video controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+ '<video autoplay="true" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>'
);
}
$container.show();
//START TRB00068
// Check to play Video on ipad
if (avwUserEnvObj.os == "ipad") {
// Show confim message to play background music
$("#contentVideoConfirm").css('z-index', 999);
$("#contentVideoConfirm_OK").unbind('click');
$("#contentVideoConfirm_OK").click(function () {
$("#contentVideoConfirm").hide();
isShowVideoContent = true;
$container.show();
$("#dialog").find('video').load();
$("#dialog").find('video').play();
});
$("#contentVideoConfirm").show();
$("#contentVideoConfirm").center();
}
else{
$container.show();
}
//END TRB00068
};
var isShowVideoContent = false;
//handle for content type = music
function handleForContentTypeMusic(resourceUrl){
......@@ -2136,13 +2171,12 @@ function handleForContentTypeMusic(resourceUrl){
$container.css('background', 'url(./img/iPad_music.png) center center no-repeat');
$container.css('background-color', 'white');
//$container.css('background-attachment', 'fixed');
if (ClientData.userOpt_musicMode() == "1") {
$container.html(
'<h1>'
+ '</h1>'
+ '<audio loop="true" controls style="position: absolute; width: 100%; bottom: 1%;">'
+ '<audio autoplay="true" loop="true" controls style="position: absolute; width: 100%; bottom: 1%;">'
+ ' <source src="' + resourceUrl + '" type="audio/mpeg"> '
+ '</audio>'
);
......@@ -2151,17 +2185,34 @@ function handleForContentTypeMusic(resourceUrl){
$container.html(
'<h1>'
+ '</h1>'
+ '<audio controls style="position: absolute; width: 100%; bottom: 1%;">'
+ '<audio autoplay="true" controls style="position: absolute; width: 100%; bottom: 1%;">'
+ ' <source src="' + resourceUrl + '" type="audio/mpeg"> '
+ '</audio>'
);
}
if(avwUserEnvObj.browser == 'firefox'){
$container.find('audio').css('height', '30px');
}
$container.show();
//START TRB00068
// Check to play BGM on ipad
if (avwUserEnvObj.os == "ipad") {
// Show confim message to play background music
$("#contentAudioConfirm").css('z-index', 999);
$("#contentAudioConfirm_OK").unbind('click');
$("#contentAudioConfirm_OK").click(function () {
$("#contentAudioConfirm").hide();
$("#dialog").find('audio').load();
$("#dialog").find('audio').play();
});
$("#contentAudioConfirm").show();
$("#contentAudioConfirm").center();
}
//END TRB00068
};
//handle for content type = html
......@@ -2320,7 +2371,25 @@ function originalScreenForNotPdfType(){
$container.css('background-color', 'white');
}
$container.show();
//START TRB00068
if (avwUserEnvObj.os == "ipad") {
if(contentType == ContentTypeKeys.Type_Video){
if(isShowVideoContent){
$container.show();
}
else{
}
}
else{
$container.show();
}
}
else{
$container.show();
}
//END TRB00068
isZoomingContent = false;
};
......@@ -2905,7 +2974,7 @@ ContentPage.prototype.drawPage = function (context, opt) {
else {
nCountObjectLoad++;
if (nCountObjectLoad == pageObjects.length) {
if (nCountObjectLoad == objPageTemp.length) {
/* draw marking */
drawMarkingOnScreen(opt);
......@@ -4139,15 +4208,23 @@ function stopAllAudio() {
$('#playaudio').children().remove();
} else {
if (document.getElementById("play_audio_0") != undefined) {
document.getElementById("play_audio_0").pause();
if(document.getElementById("play_audio_0").played){
document.getElementById("play_audio_0").pause();
}
}
if (document.getElementById("play_audio_1") != undefined) {
document.getElementById("play_audio_1").pause();
if (document.getElementById("play_audio_1") != undefined) {
if(document.getElementById("play_audio_1").played){
document.getElementById("play_audio_1").pause();
}
}
if (document.getElementById("play_audio_2") != undefined) {
document.getElementById("play_audio_2").pause();
if(document.getElementById("play_audio_2").played){
document.getElementById("play_audio_2").pause();
}
}
}
};
......
abvw/js/contentview_Events.js
......@@ -459,23 +459,26 @@ function lastPage_click() {
function createLockLayout(opt){
if(opt == true){
var $html = $('<div id="locking" style="z-index: 100; position: absolute; height: 100%; width: 100%; display: none;"></div>');
if(!$('#locking').size()){
var $html = $('<div id="locking" style="z-index: 100; position: absolute; height: 100%; width: 100%; "></div>');
$('#wrapper').append($html);
$html.show();
$('#locking').live('click', function(event){ event.preventDefault(); });
}
else{
$('#locking').show();
}
}
else{
//$('body').append($html);
$('#locking').hide();
$('#locking').remove();
}
if($('#locking').size()){
$('#locking').hide();
$('#locking').remove();
}
}
};
/* handle keydown */
......@@ -921,14 +924,15 @@ function mouseMove_canvasMain(event) {
}
}
if(moveFlag == false && _3dAnimate == true){
if(moveFlag == false && _3dAnimate == true){
var imagePt = screenToImage(event.pageX, event.pageY);
var hitObj = getContent().currentPage.hitTest(imagePt.x, imagePt.y);
if(hitObj){
_3dAction = _3dActionType.TouchMove_MouseMove;
hitObj.action(imagePt);
if(is3DObject(hitObj)){
_3dAction = _3dActionType.TouchMove_MouseMove;
hitObj.action(imagePt);
}
}
else{
_3dAnimate = false;
......@@ -1027,7 +1031,8 @@ function mouseDown_CanvasMain(event) {
var hitPageObj = getContent().currentPage.hitTest(imagePt.x, imagePt.y);
moveFlag = true;
_3dAnimate = false;
if(is3DObject(hitPageObj)){
clearTimeout(this.downTimer);
this.downTimer = setTimeout(function() {
......@@ -1270,7 +1275,8 @@ function onTouchstart(evt){
//Start Function : No.9 - Editor : Long - Date : 08/16/2013 - Summary :
var imagePt = screenToImage(evt.pageX, evt.pageY);
var hitPageObj = getContent().currentPage.hitTest(imagePt.x, imagePt.y);
_3dAnimate = false;
if (hitPageObj) {
if(is3DObject(hitPageObj)){
......@@ -1656,9 +1662,10 @@ function onTouchmove(evt){
var hitObj = getContent().currentPage.hitTest(imagePt.x, imagePt.y);
if(hitObj){
_3dAction = _3dActionType.TouchMove_MouseMove;
hitObj.action(imagePt);
if(is3DObject(hitObj)){
_3dAction = _3dActionType.TouchMove_MouseMove;
hitObj.action(imagePt);
}
}
else{
......
abvw/js/contentview_GetData.js
......@@ -1408,6 +1408,10 @@ function assignCurrentContentPage(nav){
function correctCanvasPosition(){
//correct canvas position
// Set default value for moving3D object to prevent other object fired when
//hold on 3d object and move next or prev page.
_3dAnimate = false;
if(animateType == animateTypeKeys.Type_Slide){
$('#canvasWrapper').css("left",'0px');
$('#main').css("left",'13px');
......
abvw/js/contentview_InitObjects.js
......@@ -52,13 +52,17 @@ function initDisplayMarking() {
}
disableAllControl();
} else {
//change image
$('#imgmarkingtoolbar').removeClass();
$('#imgmarkingtoolbar').addClass('markingToolbar');
}
else {
//change image
if(ClientData.serviceOpt_marking() == 'Y'){
$('#imgmarkingtoolbar').removeClass();
$('#imgmarkingtoolbar').addClass('markingToolbar');
}
}
} else {
}
else {
$("#dlgMarking").hide();
// change class
......@@ -67,9 +71,11 @@ function initDisplayMarking() {
$('#draw_canvas').css('display', 'none');
//change image
$('#imgmarkingtoolbar').removeClass();
$('#imgmarkingtoolbar').addClass('markingToolbar');
//change image
if(ClientData.serviceOpt_marking() == 'Y'){
$('#imgmarkingtoolbar').removeClass();
$('#imgmarkingtoolbar').addClass('markingToolbar');
}
}
};
......@@ -281,9 +287,7 @@ function initPage() {
//handleFromBookMarkPage();
/* check move content */
if (ClientData.bookmark_pageNo()) {
handleFromBookMarkPage();
} else if (ClientData.common_prePageNo()) {
/* handle from jump content */
handleFromJumpContent();
......@@ -292,9 +296,13 @@ function initPage() {
oldContent_Back();
} else {
if (getPageIndex() == 0) {
//START TRB00069
isPendingContentBGM = true;
//END TRB00069
getContent().setPageImages(totalPage, pageImages)
.setPageObjects(pageObjects)
.setUpPage(0);
//START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
createPageBGM();
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
......@@ -422,10 +430,15 @@ function initPage() {
oldContent_Back();
} else {
if (getPageIndex() == 0) {
//START TRB00069
isPendingContentBGM = true;
//END TRB00069
getContent().setPageImages(totalPage, pageImages)
.setPageObjects(pageObjects)
.setUpPage(0);
//START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
//START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
createPageBGM();
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM
......
abvw/js/header.js
......@@ -104,6 +104,7 @@ $(document).ready(function () {
else {
$('body').click(bodyClickFunction);
}
});
function searchBoxHoverFunction(){
......@@ -138,7 +139,8 @@ function bodyClickFunction(event) {
if (isTouchDevice()) {
// Check mouse is in rectangle of searching panel
if ($('#header-searchbox').css('display') != "none") {
if ($('#header-searchbox').is(":visible")) //if ($('#header-searchbox').css('display') != "none")
{
var currPosX, currPosY;
var avwUserEnvObj = new UserEnvironment();
......@@ -152,20 +154,33 @@ function bodyClickFunction(event) {
currPosX = event.targetTouches[0].clientX;
currPosY = event.targetTouches[0].clientY;
}
if (currPosX >= $('#header-searchbox').position().left
&& currPosX <= ($('#header-searchbox').position().left + $('#header-searchbox').width())
&& currPosY >= $('#header-searchbox').position().top
&& currPosY <= ($('#header-searchbox').position().top + $('#header-searchbox').height())) {
isHoverOn = true;
var leftsearch = $('#header-searchbox').offset().left;
var topsearch = $('#header-searchbox').offset().top;
var rightsearch = $('#header-searchbox').width() + leftsearch;
var bottomsearch = $('#header-searchbox').height() + topsearch;
// check mouse position in search region
if (currPosX >= leftsearch && currPosX <= rightsearch && currPosY >= topsearch && currPosY <= bottomsearch) {
isHoverOn = true;
}
else {
isHoverOn = false;
//$('#header-searchbox').hide();
$('#header-searchbox').hide();
}
// if (currPosX >= $('#header-searchbox').position().left
// && currPosX <= ($('#header-searchbox').position().left + $('#header-searchbox').width())
// && currPosY >= $('#header-searchbox').position().top
// && currPosY <= ($('#header-searchbox').position().top + $('#header-searchbox').height())) {
// isHoverOn = true;
// }
// else {
// isHoverOn = false;
// }
}
}
else {
if (!isHoverOn) {
......@@ -893,7 +908,7 @@ function showListPushMessage(data)
for (var i = 0; i < data.messageList.length && i <= (data.recordTo - data.recordFrom); i++)
{
var titleMessage = truncate(data.messageList[i].messageDetail, 30).replace(/</g, '&lt;').replace(/>/g, '&gt;');
var detailMessage = data.messageList[i].messageDetail.replace(/\n/g, '<br/>').replace(/</g, '&lt;').replace(/>/g, '&gt;');
var detailMessage = data.messageList[i].messageDetail.replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g, '<br/>');
var message = '<div class="newmsg">';
message += '<h5 class="postItem"><a href="#">' + titleMessage + '</a></h5>';
message += '<p>' + detailMessage + '<span class="date">' + getDateCreatePushMessage(data.messageList[i].messageSendDate) + '</span></p></div>';
......
abvw/settings.html
......@@ -273,7 +273,7 @@
<footer>
<div class="border">
<div class="cnt_footer">
COPYRIGHT © 2012 株式会社Agentec ALL RIGHTS RESERVED.
COPYRIGHT © 2012 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
......
login.html
......@@ -107,7 +107,7 @@ jQuery.event.add(window,"load",function() { // 全ての読み込み完了後に
<footer>
<div class="border">
<div class="cnt_footer">
COPYRIGHT © 2012 株式会社Agentec ALL RIGHTS RESERVED.
COPYRIGHT © 2012 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
......
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