Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
01b44789
Commit
01b44789
authored
Jul 22, 2015
by
Masaru Abe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#10677 Web版でHTMLとアンケートを選択すると、コンテンツBGMが停止する
parent
eb19d33a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
40 deletions
+6
-40
abvw/js/contentview_CreateObjects.js
+5
-39
abvw/js/contentview_General.js
+1
-1
No files found.
abvw/js/contentview_CreateObjects.js
View file @
01b44789
...
...
@@ -851,16 +851,9 @@ CONTENTVIEW_CREATEOBJECT.htmlLinkButton = function (mediaType, actionType, id, i
//abe
//alert("htmlLinkButton");
//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 */
if
(
!
CONTENTVIEW_GENERAL
.
isStopBGM
&&
!
CONTENTVIEW
.
isPendingContentBGM
)
{
CONTENTVIEW
.
stopAllAudio
();
}
//CONTENTVIEW.stopAllAudio();
//CONTENTVIEW_CREATEOBJECT.createPageBGM();
if
(
resourceUrl
!=
""
)
{
...
...
@@ -980,16 +973,8 @@ CONTENTVIEW_CREATEOBJECT.anket = function (mediaType, actionType, id, imageUrl,
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 */
if
(
!
CONTENTVIEW_GENERAL
.
isStopBGM
&&
!
CONTENTVIEW
.
isPendingContentBGM
)
{
CONTENTVIEW
.
stopAllAudio
();
}
//CONTENTVIEW.stopAllAudio();
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
objectLog
.
locationWidth
=
w
;
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 */
if
(
!
CONTENTVIEW_GENERAL
.
isStopBGM
&&
!
CONTENTVIEW
.
isPendingContentBGM
)
{
CONTENTVIEW
.
stopAllAudio
();
}
//CONTENTVIEW.stopAllAudio();
var
isShowResult
,
isSendResult
;
if
(
showResult
==
1
){
isShowResult
=
true
;
...
...
@@ -1081,16 +1058,8 @@ CONTENTVIEW_CREATEOBJECT.quiz = function (mediaType, actionType, id, imageUrl, x
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 */
if
(
!
CONTENTVIEW_GENERAL
.
isStopBGM
&&
!
CONTENTVIEW
.
isPendingContentBGM
)
{
CONTENTVIEW
.
stopAllAudio
();
}
//CONTENTVIEW.stopAllAudio();
var
url
=
CONTENTVIEW_GETDATA
.
getURLPageImage
(
"webEnqueteReply/init"
)
+
"&abObjectId="
+
objectId
+
"&sid="
+
CONTENTVIEW
.
getSessionId
();
var
isFullScreen
=
false
;
...
...
@@ -1118,9 +1087,6 @@ CONTENTVIEW_CREATEOBJECT.audioType3 = function (mediaType, actionType, id, image
//詳細ログ作成
var
objectLog
=
new
ObjectLogEntity
();
objectLog
.
contentid
=
CONTENTVIEW_GENERAL
.
contentID
;
objectLog
.
pageNo
=
CONTENTVIEW_GETDATA
.
getPageIndex
()
+
1
;
//0始まりのページ番号
objectLog
.
objectId
=
objectId
;
...
...
@@ -2925,7 +2891,7 @@ CONTENTVIEW_CREATEOBJECT.createPageBGM = function(){
for
(
var
i
=
0
;
i
<
currentPageObject
.
length
;
i
++
){
var
BGMObject
=
currentPageObject
[
i
];
if
(
BGMObject
.
mediaType
==
'3'
&&
BGMObject
.
actionType
==
'2'
&&
BGMObject
.
playType
==
'2'
){
CONTENTVIEW_GENERAL
.
isStopBGM
=
true
;
audioFile
=
BGMObject
.
audioFile
;
playType
=
BGMObject
.
playType
;
...
...
abvw/js/contentview_General.js
View file @
01b44789
...
...
@@ -473,7 +473,7 @@ CONTENTVIEW_GENERAL.ready = function(initContentId){
CONTENTVIEW_GENERAL
.
arrThumbnailsLoaded
=
[];
CONTENTVIEW_GENERAL
.
isSendingData
=
true
;
CONTENTVIEW_GENERAL
.
isPlayBGMUnlock
=
false
;
//未使用
CONTENTVIEW_GENERAL
.
isStopBGM
=
false
;
//
CONTENTVIEW_GENERAL.isStopBGM = false;
CONTENTVIEW_GENERAL
.
isJumpNotFromFirstPage
=
false
;
CONTENTVIEW_GENERAL
.
standardRatio
=
1
;
//未使用
CONTENTVIEW_GENERAL
.
currentRatio
=
1
;
//未使用
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment