Commit 0d8a4797 by lduarte1991

extend changes of url/raw issue to video annotions

parent 4f981d99
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
<%namespace name='static' file='/static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<%static:css group='style-vendor-tinymce-content'/> ${static.css(group='style-vendor-tinymce-content', raw=True)}
<%static:css group='style-vendor-tinymce-skin'/> ${static.css(group='style-vendor-tinymce-skin', raw=True)}
<script type="text/javascript" src="${static.url('js/vendor/tinymce/js/tinymce/tinymce.full.min.js')}" /> <script type="text/javascript" src="${static.url('js/vendor/tinymce/js/tinymce/tinymce.full.min.js', raw=True)}" />
<script type="text/javascript" src="${static.url('js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js')}" /> <script type="text/javascript" src="${static.url('js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js', raw=True)}" />
<div class="annotatable-wrapper"> <div class="annotatable-wrapper">
<div class="annotatable-header"> <div class="annotatable-header">
...@@ -35,7 +36,7 @@ ...@@ -35,7 +36,7 @@
</div> </div>
</div> </div>
</div> </div>
<script> <script>
function onClickHideInstructions(){ function onClickHideInstructions(){
...@@ -70,16 +71,16 @@ ...@@ -70,16 +71,16 @@
optionsAnnotator: { optionsAnnotator: {
permissions:{ permissions:{
user: { user: {
id:"${user.email}", id:"${user.email}",
name:"${user.username}" name:"${user.username}"
}, },
userString: function (user) { userString: function (user) {
if (user && user.name) if (user && user.name)
return user.name; return user.name;
return user; return user;
}, },
userId: function (user) { userId: function (user) {
if (user && user.id) if (user && user.id)
return user.id; return user.id;
return user; return user;
}, },
...@@ -103,7 +104,7 @@ ...@@ -103,7 +104,7 @@
} }
for (_i = 0, _len = tokens.length; _i < _len; _i++) { for (_i = 0, _len = tokens.length; _i < _len; _i++) {
token = tokens[_i]; token = tokens[_i];
if (this.userId(user) === token) { if (this.userId(user) === token) {
return true; return true;
...@@ -168,7 +169,7 @@ ...@@ -168,7 +169,7 @@
var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/"; var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/";
tinymce.baseURL = "${settings.STATIC_URL}" + "js/vendor/tinymce/js/tinymce"; tinymce.baseURL = "${settings.STATIC_URL}" + "js/vendor/tinymce/js/tinymce";
//remove old instances //remove old instances
if (Annotator._instances.length !== 0) { if (Annotator._instances.length !== 0) {
$('#videoHolder').annotator("destroy"); $('#videoHolder').annotator("destroy");
...@@ -176,9 +177,9 @@ ...@@ -176,9 +177,9 @@
delete ova; delete ova;
//Load the plugin Video/Text Annotation //Load the plugin Video/Text Annotation
var ova = new OpenVideoAnnotation.Annotator($('#videoHolder'),options); var ova = new OpenVideoAnnotation.Annotator($('#videoHolder'),options);
ova.annotator.addPlugin('Tags'); ova.annotator.addPlugin('Tags');
//Catch //Catch
var annotator = ova.annotator, var annotator = ova.annotator,
catchOptions = { catchOptions = {
......
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