Skip to content

C
check
Commit 01b44789 by Masaru Abe
Options

#10677 Web版でHTMLとアンケートを選択すると、コンテンツBGMが停止する

parent eb19d33a
Showing with 6 additions and 40 deletions
abvw/js/contentview_CreateObjects.js
...@@ -851,16 +851,9 @@ CONTENTVIEW_CREATEOBJECT.htmlLinkButton = function (mediaType, actionType, id, i ...@@ -851,16 +851,9 @@ CONTENTVIEW_CREATEOBJECT.htmlLinkButton = function (mediaType, actionType, id, i
//abe //abe
//alert("htmlLinkButton"); //alert("htmlLinkButton");
//CONTENTVIEW_STREAMING.debugLog("htmlLinkButton:" + resourceUrl + ":" + objectId); //CONTENTVIEW_STREAMING.debugLog("htmlLinkButton:" + resourceUrl + ":" + objectId);
if($('#play_audio_0').length){
if(document.getElementById("play_audio_0").played){
document.getElementById("play_audio_0").pause();
}
}
/*stop audio on page */ /*stop audio on page */
if(!CONTENTVIEW_GENERAL.isStopBGM && !CONTENTVIEW.isPendingContentBGM) { //CONTENTVIEW.stopAllAudio();
CONTENTVIEW.stopAllAudio();
}
//CONTENTVIEW_CREATEOBJECT.createPageBGM(); //CONTENTVIEW_CREATEOBJECT.createPageBGM();
if (resourceUrl != "") { if (resourceUrl != "") {
...@@ -980,16 +973,8 @@ CONTENTVIEW_CREATEOBJECT.anket = function (mediaType, actionType, id, imageUrl, ...@@ -980,16 +973,8 @@ CONTENTVIEW_CREATEOBJECT.anket = function (mediaType, actionType, id, imageUrl,
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog); COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//--- //---
if($('#play_audio_0').length){
if(document.getElementById("play_audio_0").played){
document.getElementById("play_audio_0").pause();
}
}
/*stop audio on page */ /*stop audio on page */
if(!CONTENTVIEW_GENERAL.isStopBGM && !CONTENTVIEW.isPendingContentBGM) { //CONTENTVIEW.stopAllAudio();
CONTENTVIEW.stopAllAudio();
}
var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId(); var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId();
...@@ -1026,16 +1011,8 @@ CONTENTVIEW_CREATEOBJECT.exam = function (mediaType, actionType, id, imageUrl, x ...@@ -1026,16 +1011,8 @@ CONTENTVIEW_CREATEOBJECT.exam = function (mediaType, actionType, id, imageUrl, x
objectLog.locationWidth = w; objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog); COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//--- //---
if($('#play_audio_0').length){
if(document.getElementById("play_audio_0").played){
document.getElementById("play_audio_0").pause();
}
}
/*stop audio on page */ /*stop audio on page */
if(!CONTENTVIEW_GENERAL.isStopBGM && !CONTENTVIEW.isPendingContentBGM) { //CONTENTVIEW.stopAllAudio();
CONTENTVIEW.stopAllAudio();
}
var isShowResult, isSendResult; var isShowResult, isSendResult;
if(showResult == 1){ if(showResult == 1){
isShowResult = true; isShowResult = true;
...@@ -1081,16 +1058,8 @@ CONTENTVIEW_CREATEOBJECT.quiz = function (mediaType, actionType, id, imageUrl, x ...@@ -1081,16 +1058,8 @@ CONTENTVIEW_CREATEOBJECT.quiz = function (mediaType, actionType, id, imageUrl, x
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog); COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//--- //---
if($('#play_audio_0').length){
if(document.getElementById("play_audio_0").played){
document.getElementById("play_audio_0").pause();
}
}
/*stop audio on page */ /*stop audio on page */
if(!CONTENTVIEW_GENERAL.isStopBGM && !CONTENTVIEW.isPendingContentBGM) { //CONTENTVIEW.stopAllAudio();
CONTENTVIEW.stopAllAudio();
}
var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId(); var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "&abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId();
var isFullScreen = false; var isFullScreen = false;
...@@ -1118,9 +1087,6 @@ CONTENTVIEW_CREATEOBJECT.audioType3 = function (mediaType, actionType, id, image ...@@ -1118,9 +1087,6 @@ CONTENTVIEW_CREATEOBJECT.audioType3 = function (mediaType, actionType, id, image
//詳細ログ作成 //詳細ログ作成
var objectLog = new ObjectLogEntity(); var objectLog = new ObjectLogEntity();
objectLog.contentid = CONTENTVIEW_GENERAL.contentID; objectLog.contentid = CONTENTVIEW_GENERAL.contentID;
objectLog.pageNo = CONTENTVIEW_GETDATA.getPageIndex() + 1; //0始まりのページ番号 objectLog.pageNo = CONTENTVIEW_GETDATA.getPageIndex() + 1; //0始まりのページ番号
objectLog.objectId = objectId; objectLog.objectId = objectId;
...@@ -2925,7 +2891,7 @@ CONTENTVIEW_CREATEOBJECT.createPageBGM = function(){ ...@@ -2925,7 +2891,7 @@ CONTENTVIEW_CREATEOBJECT.createPageBGM = function(){
for(var i = 0; i < currentPageObject.length; i++){ for(var i = 0; i < currentPageObject.length; i++){
var BGMObject = currentPageObject[i]; var BGMObject = currentPageObject[i];
if(BGMObject.mediaType == '3' && BGMObject.actionType=='2' && BGMObject.playType == '2'){ if(BGMObject.mediaType == '3' && BGMObject.actionType=='2' && BGMObject.playType == '2'){
CONTENTVIEW_GENERAL.isStopBGM = true;
audioFile = BGMObject.audioFile; audioFile = BGMObject.audioFile;
playType = BGMObject.playType; playType = BGMObject.playType;
......
abvw/js/contentview_General.js
...@@ -473,7 +473,7 @@ CONTENTVIEW_GENERAL.ready = function(initContentId){ ...@@ -473,7 +473,7 @@ CONTENTVIEW_GENERAL.ready = function(initContentId){
CONTENTVIEW_GENERAL.arrThumbnailsLoaded = []; CONTENTVIEW_GENERAL.arrThumbnailsLoaded = [];
CONTENTVIEW_GENERAL.isSendingData = true; CONTENTVIEW_GENERAL.isSendingData = true;
CONTENTVIEW_GENERAL.isPlayBGMUnlock = false; //未使用 CONTENTVIEW_GENERAL.isPlayBGMUnlock = false; //未使用
CONTENTVIEW_GENERAL.isStopBGM = false; //CONTENTVIEW_GENERAL.isStopBGM = false;
CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = false; CONTENTVIEW_GENERAL.isJumpNotFromFirstPage = false;
CONTENTVIEW_GENERAL.standardRatio = 1; //未使用 CONTENTVIEW_GENERAL.standardRatio = 1; //未使用
CONTENTVIEW_GENERAL.currentRatio = 1; //未使用 CONTENTVIEW_GENERAL.currentRatio = 1; //未使用
......
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