Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
officejs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
officejs
Commits
832bc3fd
Commit
832bc3fd
authored
Jul 29, 2014
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add mozMediaSource & audio/mpeg for firefox
parent
b36a9816
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
10 deletions
+12
-10
dev/audioplayer_control/control.js
dev/audioplayer_control/control.js
+1
-1
dev/audioplayer_playlist_offline/index.html
dev/audioplayer_playlist_offline/index.html
+1
-1
dev/audioplayer_playlist_offline/playlist.js
dev/audioplayer_playlist_offline/playlist.js
+2
-2
dev/audioplayer_video_control/control.js
dev/audioplayer_video_control/control.js
+1
-1
src/audioplayer_control/control.js
src/audioplayer_control/control.js
+2
-1
src/audioplayer_playlist_offline/index.html
src/audioplayer_playlist_offline/index.html
+1
-1
src/audioplayer_playlist_offline/playlist.js
src/audioplayer_playlist_offline/playlist.js
+2
-2
src/audioplayer_video_control/control.js
src/audioplayer_video_control/control.js
+2
-1
No files found.
dev/audioplayer_control/control.js
View file @
832bc3fd
...
...
@@ -3,7 +3,7 @@
/*jslint nomen: true, maxlen:180 */
(
function
(
window
,
rJS
,
RSVP
,
loopEventListener
,
$
,
promiseEventListener
)
{
"
use strict
"
;
var
gk
=
rJS
(
window
),
AudioContext
=
window
.
AudioContext
||
window
.
webkitAudioContext
||
window
.
mozAudiocontext
||
window
.
msAudioContext
,
audioCtx
=
new
AudioContext
(),
MediaSource
=
window
.
MediaSource
||
window
.
WebKitMediaSource
,
myLoopEventListener
=
function
(
target
,
type
,
callback
,
allowDefault
)
{
var
gk
=
rJS
(
window
),
AudioContext
=
window
.
AudioContext
||
window
.
webkitAudioContext
||
window
.
mozAudiocontext
||
window
.
msAudioContext
,
audioCtx
=
new
AudioContext
(),
MediaSource
=
window
.
MediaSource
||
window
.
WebKitMediaSource
||
window
.
mozMediaSource
,
myLoopEventListener
=
function
(
target
,
type
,
callback
,
allowDefault
)
{
//////////////////////////
// Infinite event listener (promise is never resolved)
// eventListener is removed when promise is cancelled/rejected
...
...
dev/audioplayer_playlist_offline/index.html
View file @
832bc3fd
...
...
@@ -13,7 +13,7 @@
<script
id=
"rows-template"
type=
"text/x-handlebars-template"
>
{{
#
each
rows
}}
<
li
>
{{
#
compare
this
.
doc
.
type
"
audio/mp3
"
}}
{{
#
compare
this
.
doc
.
type
}}
<
a
href
=
#
page
=
control
&
id
=
{{
this
.
id
}}
&
action
=
offline
>
{{
this
.
doc
.
title
}}
<
/a
>
...
...
dev/audioplayer_playlist_offline/playlist.js
View file @
832bc3fd
...
...
@@ -31,8 +31,8 @@
});
}).
push
(
function
(
e
)
{
var
tmp
=
e
.
data
.
rows
,
i
,
j
,
exp
;
Handlebars
.
registerHelper
(
"
compare
"
,
function
(
v1
,
v2
,
options
)
{
if
(
v1
===
v2
)
{
Handlebars
.
registerHelper
(
"
compare
"
,
function
(
v1
,
options
)
{
if
(
v1
===
"
audio/mp3
"
||
v1
===
"
audio/mpeg
"
)
{
return
options
.
fn
(
this
);
}
return
options
.
inverse
(
this
);
...
...
dev/audioplayer_video_control/control.js
View file @
832bc3fd
...
...
@@ -9,7 +9,7 @@
*/
(
function
(
window
,
rJS
,
RSVP
,
loopEventListener
,
$
,
promiseEventListener
)
{
"
use strict
"
;
var
gk
=
rJS
(
window
),
MediaSource
=
window
.
MediaSource
||
window
.
WebKitMediaSource
;
var
gk
=
rJS
(
window
),
MediaSource
=
window
.
MediaSource
||
window
.
WebKitMediaSource
||
window
.
mozMediaSource
;
gk
.
declareAcquiredMethod
(
"
jio_getAttachment
"
,
"
jio_getAttachment
"
).
declareAcquiredMethod
(
"
jio_get
"
,
"
jio_get
"
).
declareAcquiredMethod
(
"
jio_remove
"
,
"
jio_remove
"
).
declareAcquiredMethod
(
"
plSave
"
,
"
plSave
"
).
declareAcquiredMethod
(
"
plGive
"
,
"
plGive
"
).
declareAcquiredMethod
(
"
displayThisPage
"
,
"
displayThisPage
"
).
declareAcquiredMethod
(
"
displayThisTitle
"
,
"
displayThisTitle
"
).
declareAcquiredMethod
(
"
allDocs
"
,
"
allDocs
"
).
declareAcquiredMethod
(
"
plEnablePage
"
,
"
plEnablePage
"
).
declareAcquiredMethod
(
"
pleaseRedirectMyHash
"
,
"
pleaseRedirectMyHash
"
).
declareMethod
(
"
render
"
,
function
(
options
)
{
var
g
=
this
;
if
(
options
.
id
)
{
...
...
src/audioplayer_control/control.js
View file @
832bc3fd
...
...
@@ -8,7 +8,8 @@
AudioContext
=
window
.
AudioContext
||
window
.
webkitAudioContext
||
window
.
mozAudiocontext
||
window
.
msAudioContext
,
audioCtx
=
new
AudioContext
(),
MediaSource
=
window
.
MediaSource
||
window
.
WebKitMediaSource
,
MediaSource
=
window
.
MediaSource
||
window
.
WebKitMediaSource
||
window
.
mozMediaSource
,
myLoopEventListener
=
function
(
target
,
type
,
callback
,
allowDefault
)
{
//////////////////////////
...
...
src/audioplayer_playlist_offline/index.html
View file @
832bc3fd
...
...
@@ -13,7 +13,7 @@
<script
id=
"rows-template"
type=
"text/x-handlebars-template"
>
{{
#
each
rows
}}
<
li
>
{{
#
compare
this
.
doc
.
type
"
audio/mp3
"
}}
{{
#
compare
this
.
doc
.
type
}}
<
a
href
=
#
page
=
control
&
id
=
{{
this
.
id
}}
&
action
=
offline
>
{{
this
.
doc
.
title
}}
<
/a
>
...
...
src/audioplayer_playlist_offline/playlist.js
View file @
832bc3fd
...
...
@@ -49,8 +49,8 @@
i
,
j
,
exp
;
Handlebars
.
registerHelper
(
"
compare
"
,
function
(
v1
,
v2
,
options
)
{
if
(
v1
===
v2
)
{
Handlebars
.
registerHelper
(
"
compare
"
,
function
(
v1
,
options
)
{
if
(
v1
===
"
audio/mp3
"
||
v1
===
"
audio/mpeg
"
)
{
return
options
.
fn
(
this
);
}
return
options
.
inverse
(
this
);
...
...
src/audioplayer_video_control/control.js
View file @
832bc3fd
...
...
@@ -15,7 +15,8 @@
(
function
(
window
,
rJS
,
RSVP
,
loopEventListener
,
$
,
promiseEventListener
)
{
"
use strict
"
;
var
gk
=
rJS
(
window
),
MediaSource
=
window
.
MediaSource
||
window
.
WebKitMediaSource
;
MediaSource
=
window
.
MediaSource
||
window
.
WebKitMediaSource
||
window
.
mozMediaSource
;
gk
.
declareAcquiredMethod
(
"
jio_getAttachment
"
,
"
jio_getAttachment
"
)
.
declareAcquiredMethod
(
"
jio_get
"
,
"
jio_get
"
)
.
declareAcquiredMethod
(
"
jio_remove
"
,
"
jio_remove
"
)
...
...
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