Skip to content

C
check
Commit b83d39d3 by Masaru Abe
Options

テスト対応

parent 0b519ee1
Showing with 38 additions and 32 deletions
abvw/js/contentview_CreateObjects.js
...@@ -2683,11 +2683,12 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) { ...@@ -2683,11 +2683,12 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
CONTENTVIEW.srcAudioType0 = audio; CONTENTVIEW.srcAudioType0 = audio;
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') { //if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') {
$('#playaudio').html( // $('#playaudio').html(
' <embed id="play_audio_0" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>' // ' <embed id="play_audio_0" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>'
); // );
} else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) { //} else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
$('#playaudio').html( $('#playaudio').html(
' <audio id="play_audio_0" loop="loop" >' + ' <audio id="play_audio_0" loop="loop" >' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
...@@ -2702,11 +2703,12 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) { ...@@ -2702,11 +2703,12 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
} }
} else { } else {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') { //if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') {
$('#playaudio').html( // $('#playaudio').html(
' <embed id="play_audio_0" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>' // ' <embed id="play_audio_0" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>'
); // );
} else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) { //} else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
$('#playaudio').html( $('#playaudio').html(
' <audio id="play_audio_0">' + ' <audio id="play_audio_0">' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
...@@ -2782,13 +2784,14 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) { ...@@ -2782,13 +2784,14 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
CONTENTVIEW.srcAudioType1 = audio; CONTENTVIEW.srcAudioType1 = audio;
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') { //if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') {
$('#playaudioallpage').html( // $('#playaudioallpage').html(
' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>' // ' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>'
); // );
//
} //}
else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) { //else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
$('#playaudioallpage').html( $('#playaudioallpage').html(
' <audio id="play_audio_1" loop="loop" >' + ' <audio id="play_audio_1" loop="loop" >' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
...@@ -2816,11 +2819,12 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) { ...@@ -2816,11 +2819,12 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
} }
} }
else { else {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') { //if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') {
$('#playaudioallpage').html( // $('#playaudioallpage').html(
' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>' // ' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>'
); // );
} else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) { //} else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
$('#playaudioallpage').html( $('#playaudioallpage').html(
' <audio id="play_audio_1" >' + ' <audio id="play_audio_1" >' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
...@@ -2886,11 +2890,12 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) { ...@@ -2886,11 +2890,12 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
CONTENTVIEW.srcAudioType2 = audio; CONTENTVIEW.srcAudioType2 = audio;
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') { //if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') {
$('#playaudiopage').html( // $('#playaudiopage').html(
' <embed id="play_audio_2" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>' // ' <embed id="play_audio_2" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>'
); // );
} else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) { //} else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
$('#playaudiopage').html( $('#playaudiopage').html(
' <audio id="play_audio_2" loop="loop" >' + ' <audio id="play_audio_2" loop="loop" >' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
...@@ -2904,11 +2909,12 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) { ...@@ -2904,11 +2909,12 @@ CONTENTVIEW_CREATEOBJECT.createAudio = function(audio, type) {
); );
} }
} else { } else {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') { //if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'firefox') {
$('#playaudiopage').html( // $('#playaudiopage').html(
' <embed id="play_audio_2" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>' // ' <embed id="play_audio_2" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>'
); // );
} else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) { //} else if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos()) {
$('#playaudiopage').html( $('#playaudiopage').html(
' <audio id="play_audio_2" >' + ' <audio id="play_audio_2" >' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
......
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