Commit 7db9397f by Kim Eunchul

#40385 【TECSS(Biz) webviewer 1.9】pdfコンテンツを回転した状態でコンテンツBGMとページBGMが再生される

parent 1d9e92a4
......@@ -5816,6 +5816,22 @@ CONTENTVIEW.rotateR = function() {
var videoObj = document.getElementById('videoOnPage');
videoObj.remove();
}
if(document.getElementById("play_audio_0")){
document.getElementById("play_audio_0").pause();
}
if(document.getElementById("play_audio_1")){
document.getElementById("play_audio_1").pause();
}
if(document.getElementById("play_audio_2")){
document.getElementById("play_audio_2").pause();
}
}else{
if(document.getElementById("play_audio_2")){
document.getElementById("play_audio_2").play();
}else if(document.getElementById("play_audio_1")){
document.getElementById("play_audio_1").play();
}
}
CONTENTVIEW.changePageWithoutSlide($("#txtSlider").val() - 1);
......@@ -5841,12 +5857,32 @@ CONTENTVIEW.rotateL = function() {
}
//CONTENTVIEW.srcRect.width = 0;
if($('#rotatebtnR').attr('angle') != '0'){
if(document.getElementById('videoOnPage')){
var videoObj = document.getElementById('videoOnPage');
videoObj.remove();
}
if(document.getElementById("play_audio_0")){
document.getElementById("play_audio_0").pause();
console.log("play_audio_0 pause!!!");
}
if(document.getElementById("play_audio_1")){
document.getElementById("play_audio_1").pause();
console.log("play_audio_1 pause!!!");
}
if(document.getElementById("play_audio_2")){
document.getElementById("play_audio_2").pause();
console.log("play_audio_2 pause!!!");
}
}else{
if(document.getElementById("play_audio_2")){
document.getElementById("play_audio_2").play();
}else if(document.getElementById("play_audio_1")){
document.getElementById("play_audio_1").play();
console.log("play_audio_1 play!!!");
}
}
CONTENTVIEW.changePageWithoutSlide($("#txtSlider").val() - 1);
......
......@@ -2715,7 +2715,7 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
// audio = audio.replace("webResourceDownload/", "webResourceDownload");
// }
if (audio != '') {
if (audio != '' && $('#rotatebtnR').attr('angle') == '0') {
if (type == "0") { /* play when click */
CONTENTVIEW.stopAllAudio();
......@@ -2848,7 +2848,7 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
CONTENTVIEW.TypeAudio1 = type;
CONTENTVIEW.srcAudioType1 = audio;
if (ClientData.userOpt_musicMode() == "1") {
if (ClientData.userOpt_musicMode() == "1" && $('#rotatebtnR').attr('angle') == '0') {
//if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') {
// $('#playaudioallpage').html(
// ' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>'
......
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