Skip to content
Snippets Groups Projects
Commit 385b893d authored by srosse's avatar srosse
Browse files

no-jira: deeper webdav test, replace play sound javascript with audio tag

parent 8aca9595
No related branches found
No related tags found
No related merge requests found
$r.render("chats") $r.render("chats")
#if($iconsHolder.size() > 0) #if($iconsHolder.size() > 0)
<div id="o_im_message"> <div id="o_im_message">
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
## Play sound using scriptaculous library. document.title = "$r.translate('im.new.message.short')";
## Use jQuery.ready to deferre execution and prevent errors in IE /* ]]> */
jQuery(function() { </script>
BPlayer.playSound('$newMessageSoundURL'); ## render the new message icon links
}); #foreach ($holder in $iconsHolder)
document.title = "$r.translate('im.new.message.short')"; $r.render("${holder}")
/* ]]> */ #end
</script> <audio src="$newMessageSoundURL" autoplay />
## render the new message icon links
#foreach ($holder in $iconsHolder)
$r.render("${holder}")
#end
</div> </div>
#end #end
......
...@@ -3,26 +3,6 @@ var BPlayer = { ...@@ -3,26 +3,6 @@ var BPlayer = {
BPlayer.insertHTML5Player(address,domId,width,height,start,duration,provider,streamer,autostart,repeat,controlbar,poster); BPlayer.insertHTML5Player(address,domId,width,height,start,duration,provider,streamer,autostart,repeat,controlbar,poster);
}, },
playSound : function(soundUrl, domId) {
if(!jwplayer.utils.isIE()) {
var playerUrl = BPlayer.playerUrl();
var args = {
file:soundUrl,
start:0,
autostart:true,
repeat:'none',
controlbar:'none',
controls: false,
width: '1px',
height: '1px',
icons:false,
showicons:false,
flashplayer:playerUrl
};
jwplayer(domId).setup(args);
}
},
insertHTML5Player : function (address, domId, width, height, start, duration, provider, streamer, autostart, repeat, controlbar, poster) { insertHTML5Player : function (address, domId, width, height, start, duration, provider, streamer, autostart, repeat, controlbar, poster) {
var videoUrl = address var videoUrl = address
if(address.indexOf('://') < 0 && (address.indexOf('/raw/static/') == 0 || address.indexOf('/secstatic/qtieditor/') >= 0 || address.indexOf('/secstatic/qti/') >= 0)) { if(address.indexOf('://') < 0 && (address.indexOf('/raw/static/') == 0 || address.indexOf('/secstatic/qtieditor/') >= 0 || address.indexOf('/secstatic/qti/') >= 0)) {
......
...@@ -759,6 +759,26 @@ public class WebDAVCommandsTest extends WebDAVTestCase { ...@@ -759,6 +759,26 @@ public class WebDAVCommandsTest extends WebDAVTestCase {
//check //check
VFSItem level1Lock = level_1_Container.resolve("DT_02"); VFSItem level1Lock = level_1_Container.resolve("DT_02");
Assert.assertNull(level1Lock); Assert.assertNull(level1Lock);
//MKCOL in the folder deeper
VFSContainer level_2_Container = level_1_Container.createChildContainer("DT2_01");
VFSContainer level_3_Container = level_2_Container.createChildContainer("DT3_01");
VFSContainer level_4_Container = level_3_Container.createChildContainer("DT4_01");
Assert.assertNotNull(level_4_Container);
URI level4Uri = UriBuilder.fromUri(courseUri).path("_courseelementdata")
.path("Directory").path("DT_01").path("DT2_01").path("DT3_01").path("DT4_01").build();
int propfind4Code = conn.propfindTry(level4Uri, 1);
Assert.assertEquals(207, propfind4Code);
URI level5Uri = UriBuilder.fromUri(level4Uri).path("DT5_01").build();
int mkcol5Code = conn.mkcol(level5Uri);
Assert.assertEquals(409, mkcol5Code);
//check
VFSItem level5Mkcol = level_1_Container.resolve("DT2_01").resolve("DT3_01").resolve("DT4_01").resolve("DT5_01");
Assert.assertNull(level5Mkcol);
IOUtils.closeQuietly(conn); IOUtils.closeQuietly(conn);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment