Skip to content

E
edx-platform
Commit 976c3cb1 by lduarte1991
Options

Annotation Tool: Fix Share Plugin style and spacing 

 - fixed parseInt issue

 - PR fixes
parent deefe9b1
Showing with 145 additions and 123 deletions
common/static/js/vendor/ova/share-annotator.js
......@@ -29,13 +29,13 @@ Annotator.Plugin.Share = (function(_super) {
Share.prototype.options = {
shareIn: ['facebook', 'twitter', 'email', 'google'],
getUrl: {
'facebook':function(title, link, noteText){
'facebook': function(title, link, noteText) {
return 'https://www.facebook.com/sharer/sharer.php?s=100&p[url]=' + link + '&p[title]=' + encodeURIComponent('Open Video Annotation') + '&p[summary]=' + noteText;
},
'twitter':function(title, link, noteText){
'twitter': function(title, link, noteText) {
return 'https://twitter.com/intent/tweet?original_referer=' + link + '&source=tweetbutton&url=' + link + "&via=OpenVideoAnnotation&text=" + encodeURIComponent('I want to share the following Open Video Annotation: ');
},
'google':function(title, link, noteText){
'google': function(title, link, noteText) {
return 'https://plus.google.com/share?url=' + link;
},
'email': function(title, link, noteText){
......@@ -46,8 +46,9 @@ Annotator.Plugin.Share = (function(_super) {
};
function Share(element, options) {
if (typeof options!='undefined')
this.options.shareIn = typeof options.shareIn!='undefined'?options.shareIn:this.options.shareIn;
if (typeof options !== 'undefined') {
this.options.shareIn = typeof options.shareIn !== 'undefined' ? options.shareIn : this.options.shareIn;
}
this.buildHTMLShareButton = __bind(this.buildHTMLShareButton, this);
this.runningAPI = __bind(this.runningAPI, this);
this.updateViewer = __bind(this.updateViewer, this);
......@@ -74,7 +75,6 @@ Annotator.Plugin.Share = (function(_super) {
var newfield = Annotator.$('<li class="annotator-item">' + this.buildHTMLShareButton('Share without saving:') + '</li>');
Annotator.$(this.field).replaceWith(newfield);
this.field=newfield[0];
// Create the actions for the buttons
this.buttonsActions(this.field, 2, this.options.baseUrl); // 2 is the method of the API that will be for share without saving
......@@ -94,25 +94,26 @@ Annotator.Plugin.Share = (function(_super) {
// Share button HTML
Share.prototype.buildHTMLShareButton = function(title, id) {
var title = title || '';
var id = typeof id!='undefined'?'annotationId="' + id + '"':'';
var titleText = title!=''?'<div class="share-text-annotator">' + title + '</div>':'';
var id = typeof id !== 'undefined' ? 'annotationId="' + id + '"' : '';
var titleText = title !== '' ? '<div class="share-text-annotator">' + title + '</div>' : '';
var shareButton = '<div class="share-button-annotator share-button" ' + id + '></div>';
var popup = '<div class="share-popup-overlay-bg" style="z-index:30000000000"><div class="share-popup"><div class="share-popup-items"></div><div class="close-btn">Close</div></div></div>';
// checks to make sure that no popup overlay already exists (though hidden) and creates a new one if it does not exist
if($('.share-popup-overlay-bg').length === 0)
if ($('.share-popup-overlay-bg').length === 0) {
$('.annotator-wrapper').append(popup);
}
return '<div class="share-container-annotator">' + titleText + shareButton + '</div>';
}
// template for the design of the Share Plugin
Share.prototype.buildHTMLPopup = function(title) {
var buttons = '';
if (typeof this.options.shareIn != 'undefined'){
if (typeof this.options.shareIn !== 'undefined'){
this.options.shareIn.forEach(function(item) {
buttons += '<div class="share-' + item + '-annotator share-button">' + item.charAt(0).toUpperCase() + item.slice(1) + '</div>';
});
}
this.uri = (typeof this.uri != 'undefined') ? this.uri : '';
this.uri = (typeof this.uri !== 'undefined') ? this.uri : '';
var title = '<div class="share-popup-title">' + title.replace(":", "") + '</div>';
var copy = '<div class="share-popup-copy">Copy and Share:</div>';
var uri = '<input type="text" class="share-popup-uri" onclick="javascript:this.select();" readonly="true" value="' + this.uri + '">';
......@@ -139,9 +140,9 @@ Annotator.Plugin.Share = (function(_super) {
// Share button
$(field).find('.share-button-annotator.share-button').click(function(event) {
event.preventDefault(); // disable normal link function so that it doesn't refresh the page
var _field = this,
ovaId = $(this).attr('annotationId'),
title = method == 1 ? 'Share' : 'Share without saving';
var _field = this;
var ovaId = $(this).attr('annotationId');
var title = method === 1 ? 'Share' : 'Share without saving';
// share.uri will be useful for buildHTMLPopup functions
share.uri = share.createAPIURL(method, ovaId, url);
......@@ -153,7 +154,7 @@ Annotator.Plugin.Share = (function(_super) {
$('.share-popup-items').html(share.buildHTMLPopup(title));
// buttons actions
if (typeof share.options.shareIn!='undefined'){
if (typeof share.options.shareIn !== 'undefined') {
share.options.shareIn.forEach(function(item) {
$('.share-' + item + '-annotator.share-button').click(function() {
var url = share.createAPIURL(method, ovaId, url);
......@@ -161,14 +162,15 @@ Annotator.Plugin.Share = (function(_super) {
var link = encodeURIComponent(url);
var noteText = share.getSource('ovaText');
var finalUrl = '';
if (method==1){
if (method === 1) {
var viewer = share.annotator.viewer;
var textarea = $(viewer.element).find('div:first').html();
noteText = encodeURIComponent(textarea);
}
finalUrl = typeof share.options.getUrl[item]!='undefined'?share.options.getUrl[item](title, link, noteText):'';
if (typeof share.options.getUrl[item]!='undefined')
finalUrl = typeof share.options.getUrl[item] !== 'undefined' ? share.options.getUrl[item](title, link, noteText) : '';
if (typeof share.options.getUrl[item] !== 'undefined') {
window.open(finalUrl);
}
});
});
}
......@@ -182,10 +184,10 @@ Annotator.Plugin.Share = (function(_super) {
var method = method || 1;
var url = url || window.location.href;
url += (url.indexOf('?') >= 0)? '&' : '?';
url += (url.indexOf('?') >= 0) ? '&' : '?';
if (method === 1) {
var ovaId = (typeof ovaId !='undefined') ? ovaId : '';
var ovaId = (typeof ovaId !== 'undefined') ? ovaId : '';
url += 'ovaId=' + ovaId;
} else if (method === 2) {
var ovaText = this.getSource('ovaText') || " ";
......@@ -196,9 +198,9 @@ Annotator.Plugin.Share = (function(_super) {
var ovaContainer = this.getSource('ovaContainer') || " ";
var ovaSrc = this.getSource('ovaSrc') || " ";
url += '&ovaStart=' + ovaStart
+'&ovaEnd=' + ovaEnd
+'&ovaContainer=' + ovaContainer
+'&ovaSrc=' + ovaSrc;
+ '&ovaEnd=' + ovaEnd
+ '&ovaContainer=' + ovaContainer
+ '&ovaSrc=' + ovaSrc;
} else if (typeof editor.OpenSeaDragon !== 'undefined' && editor.OpenSeaDragon !== -1) { // Image Annotation
var ovaLeft = this.getSource('ovaLeft') || " ";
var ovaTop = this.getSource('ovaTop') || " ";
......@@ -210,25 +212,25 @@ Annotator.Plugin.Share = (function(_super) {
var ovaHeightZoom = this.getSource('ovaHeightZoom') || " ";
var ovaContainer = this.getSource('ovaContainer') || " ";
var ovaSrc = this.getSource('ovaSrc') || " ";
url += '&ovaLeft='+ ovaLeft
+'&ovaTop='+ ovaTop
+'&ovaWidth='+ ovaWidth
+'&ovaHeight='+ ovaHeight
+'&ovaLeftZoom='+ ovaLeftZoom
+'&ovaTopZoom='+ ovaTopZoom
+'&ovaWidthZoom='+ ovaWidthZoom
+'&ovaHeightZoom='+ ovaHeightZoom
+'&ovaContainer='+ovaContainer
+'&ovaSrc='+ ovaSrc;
url += '&ovaLeft=' + ovaLeft
+ '&ovaTop=' + ovaTop
+ '&ovaWidth=' + ovaWidth
+ '&ovaHeight=' + ovaHeight
+ '&ovaLeftZoom=' + ovaLeftZoom
+ '&ovaTopZoom=' + ovaTopZoom
+ '&ovaWidthZoom=' + ovaWidthZoom
+ '&ovaHeightZoom=' + ovaHeightZoom
+ '&ovaContainer=' + ovaContainer
+ '&ovaSrc=' + ovaSrc;
} else { // Text Annotation
var ovaStart = this.getSource('ovaStart') || " ";
var ovaEnd = this.getSource('ovaEnd') || " ";
var ovastartOffset = this.getSource('ovastartOffset') || " ";
var ovaendOffset = this.getSource('ovaendOffset') || " ";
url += '&ovaStart='+ ovaStart
+'&ovaEnd='+ ovaEnd
+'&ovastartOffset='+ovastartOffset
+'&ovaendOffset='+ ovaendOffset;
url += '&ovaStart=' + ovaStart
+ '&ovaEnd=' + ovaEnd
+ '&ovastartOffset=' + ovastartOffset
+ '&ovaendOffset=' + ovaendOffset;
}
}
return url;
......@@ -236,46 +238,49 @@ Annotator.Plugin.Share = (function(_super) {
Share.prototype.getSource = function(source) {
var source = source || '';
if (source == 'ovaId') {// method 1
source=this.annotation.id;
} else {// method 2
if (source === 'ovaId') { // method 1
source = this.annotation.id;
} else { // method 2
var annotator = this.annotator;
var editor = annotator.editor;
var textarea = $(editor.element).find('textarea')[0];
if (source == 'ovaText')
if (source === 'ovaText') {
source = textarea.value;
}
if (typeof editor.VideoJS !== 'undefined' && editor.VideoJS !== -1){ // Video Annotation
if (source == 'ovaContainer')
if (typeof editor.VideoJS !== 'undefined' && editor.VideoJS !== -1) { // Video Annotation
if (source === 'ovaContainer') {
source = editor.VideoJS;
else if (source == 'ovaSrc')
}
else if (source === 'ovaSrc') {
source = annotator.mplayer[editor.VideoJS].tech.options_.source.src;
else if (source == 'ovaStart')
} else if (source === 'ovaStart') {
source = annotator.mplayer[editor.VideoJS].rangeslider.getValues().start;
else if (source == 'ovaEnd')
} else if (source === 'ovaEnd') {
source = annotator.mplayer[editor.VideoJS].rangeslider.getValues().end;
} else if (typeof editor.OpenSeaDragon !== 'undefined' && editor.OpenSeaDragon !== -1){ // Image Annotation
}
} else if (typeof editor.OpenSeaDragon !== 'undefined' && editor.OpenSeaDragon !== -1) { // Image Annotation
var annotation = editor.annotation;
if (source == 'ovaLeft')
if (source === 'ovaLeft') {
source = annotator.osda.rectPosition ? annotator.osda.rectPosition.left : annotation.rangePosition.left;
else if (source == 'ovaTop')
} else if (source === 'ovaTop') {
source = annotator.osda.rectPosition ? annotator.osda.rectPosition.top : annotation.rangePosition.top;
else if (source == 'ovaWidth')
} else if (source === 'ovaWidth') {
source = annotator.osda.rectPosition ? annotator.osda.rectPosition.width : annotation.rangePosition.width;
else if (source == 'ovaHeight')
} else if (source ==='ovaHeight') {
source = annotator.osda.rectPosition ? annotator.osda.rectPosition.height : annotation.rangePosition.height;
else if (source == 'ovaLeftZoom')
} else if (source === 'ovaLeftZoom') {
source = annotator.osda.viewer.drawer.viewport.getBounds().x;
else if (source == 'ovaTopZoom')
} else if (source === 'ovaTopZoom') {
source = annotator.osda.viewer.drawer.viewport.getBounds().y;
else if (source == 'ovaWidthZoom')
} else if (source === 'ovaWidthZoom') {
source = annotator.osda.viewer.drawer.viewport.getBounds().width;
else if (source == 'ovaHeightZoom')
} else if (source === 'ovaHeightZoom') {
source = annotator.osda.viewer.drawer.viewport.getBounds().height;
else if (source == 'ovaContainer')
} else if (source === 'ovaContainer') {
source = annotator.osda.viewer.id;
else if (source == 'ovaSrc'){
} else if (source === 'ovaSrc') {
var source = annotator.osda.viewer.source;
var tilesUrl = typeof source.tilesUrl !== 'undefined' ? source.tilesUrl : '';
var functionUrl = typeof source.getTileUrl !== 'undefined' ? source.getTileUrl : '';
......@@ -285,17 +290,18 @@ Annotator.Plugin.Share = (function(_super) {
var annotation = editor.annotation;
// if ranges is 0 then it is a comment
if (annotation.ranges.length > 0) {
if(source == 'ovastartOffset')
if(source === 'ovastartOffset') {
source = annotation.ranges[0].startOffset;
else if (source == 'ovaendOffset')
} else if (source === 'ovaendOffset') {
source = annotation.ranges[0].endOffset;
else if (source == 'ovaStart')
} else if (source === 'ovaStart') {
source = annotation.ranges[0].start;
else if (source == 'ovaEnd')
} else if (source === 'ovaEnd') {
source = annotation.ranges[0].end;
}
}
}
}
return encodeURIComponent(source);
};
......@@ -322,45 +328,45 @@ Annotator.Plugin.Share = (function(_super) {
var widthZoom = this.getParameterByName('ovaWidthZoom'); // Method 2
var heightZoom = this.getParameterByName('ovaHeightZoom'); // Method 2
var startOffset = this.getParameterByName('ovastartOffset'); // Method 2
var endOffset = this.getParameterByName('ovaendOffset');// Method 2
var endOffset = this.getParameterByName('ovaendOffset'); // Method 2
// remove the variables from the url browser
var stripped_url = top.location.href;
if (ovaId != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaId');
if (start != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaStart');
if (end != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaEnd');
if (container != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaContainer');
if (src != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaSrc');
if (text != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaText');
if (user != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaUser');
if (Left != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaLeft');
if (Top != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaTop');
if (Width != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaWidth');
if (Height != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaHeight');
if (leftZoom != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaLeftZoom');
if (topZoom != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaTopZoom');
if (widthZoom != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaWidthZoom');
if (heightZoom != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaHeightZoom');
if (startOffset != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovastartOffset');
if (endOffset != '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaendOffset');
if (ovaId !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaId');
if (start !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaStart');
if (end !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaEnd');
if (container !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaContainer');
if (src !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaSrc');
if (text !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaText');
if (user !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaUser');
if (Left !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaLeft');
if (Top !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaTop');
if (Width !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaWidth');
if (Height !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaHeight');
if (leftZoom !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaLeftZoom');
if (topZoom !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaTopZoom');
if (widthZoom !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaWidthZoom');
if (heightZoom !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaHeightZoom');
if (startOffset !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovastartOffset');
if (endOffset !== '') stripped_url = this.removeVariableFromURL(stripped_url, 'ovaendOffset');
window.history.pushState("object or string", "Title", stripped_url);
// Method 1 API with the Id of the annotation
// Example: http://danielcebrian.com/annotations/demo.html?&ovaId=wtva_SjnQb2HtqppDihKug
if (ovaId != '') {
$.extend(API, {method:1, ovaId:ovaId});
if (ovaId !== '') {
$.extend(API, {method: 1, ovaId: ovaId});
}
// Method 2 API with all the parameter to load the annotation
// Example with video: http://danielcebrian.com/annotations/demo.html?ovaContainer=vid1&ovaSrc=http%3A%2F%2Fvideo-js.zencoder.com%2Foceans-clip.mp4&ovaStart=2&ovaEnd=10&ovaText=This%20is%20test&ovaUser=Test%20User
// Example with text: http://danielcebrian.com/annotations/demo.html?ovaStart=%2Fp%5B1%5D&ovaEnd=%2Fp%5B1%5D&ovastartOffset=542&ovaendOffset=572&ovaText=API
if (start !== '' && end !== '' && container !== '' && src !== '') { // video api
$.extend(API, {method:2, start:start, end:end, container:container, src:src, text:text, user:user});
$.extend(API, {method: 2, start: start, end: end, container: container, src: src, text: text, user: user});
} else if (Left !== '' && Top !== '' && Width !== '' && Height !== '' && leftZoom !== '' && topZoom !== '' && widthZoom !== '' && heightZoom !== '') { // image api
$.extend(API, {method:2, Left:Left, Top:Top, Width:Width, Height:Height, leftZoom:leftZoom, topZoom:topZoom, widthZoom:widthZoom, heightZoom:heightZoom, container:container, src:src, text:text, user:user});
$.extend(API, {method: 2, Left: Left, Top: Top, Width: Width, Height: Height, leftZoom: leftZoom, topZoom: topZoom, widthZoom: widthZoom, heightZoom: heightZoom, container: container, src: src, text: text, user: user});
} else if (start !== '' && end !== '' && startOffset !== '' && endOffset !== '') { // text api
$.extend(API, {method:2, start:start, end:end, startOffset:startOffset, endOffset:endOffset, text:text, user:user});
$.extend(API, {method: 2, start: start, end: end, startOffset: startOffset, endOffset: endOffset, text: text, user: user});
}
return API;
}
......@@ -368,31 +374,31 @@ Annotator.Plugin.Share = (function(_super) {
var wrapper = $('.annotator-wrapper').parent()[0];
var mplayer;
var osda;
var self=this;
var self = this;
// Set Annotator in wrapper to fix quick DOM
$.data(wrapper, 'annotator', self.annotator);// Set the object in the span
annotator = window.annotator = $.data(wrapper, 'annotator');
mplayer = (typeof annotator.mplayer != 'undefined') ? annotator.mplayer : [];
osda = (typeof annotator.osda != 'undefined') ? annotator.osda : [];
mplayer = (typeof annotator.mplayer !== 'undefined') ? annotator.mplayer : [];
osda = (typeof annotator.osda !== 'undefined') ? annotator.osda : [];
// Detect if the URL has an API element
if (typeof API != 'undefined' && typeof API.method != 'undefined' && (API.method == '1' || API.method == '2')) {
if (API.method=='1'){
if (typeof API !== 'undefined' && typeof API.method !== 'undefined' && (parseInt(API.method, 10) === 1 || parseInt(API.method, 10) === 2)) {
if (parseInt(API.method, 10) === 1) {
var allannotations = annotator.plugins['Store'].annotations;
var ovaId = decodeURIComponent(API.ovaId);
var ovaId = parseInt(decodeURIComponent(API.ovaId), 10);
for (var item in allannotations) {
var an = allannotations[item];
var olditem;
if (typeof an.id!='undefined' && an.id == ovaId){// this is the annotation
if (self._isVideo(an)){// It is a video
if (typeof mplayer[an.target.container] != 'undefined'){
if (typeof an.id !== 'undefined' && parseInt(an.id, 10) === ovaId) { // this is the annotation
if (self._isVideo(an)) {// It is a video
if (typeof mplayer[an.target.container] !== 'undefined') {
var player = mplayer[an.target.container];
if (player.id_ == an.target.container){
if (player.id_ === an.target.container) {
var anFound = an;
videojs(player.id_).ready(function(){
if (player.techName != 'Youtube'){
videojs(player.id_).ready(function() {
if (player.techName !== 'Youtube') {
player.preload('auto');
}
player.autoPlayAPI = anFound;
......@@ -400,16 +406,16 @@ Annotator.Plugin.Share = (function(_super) {
});
}
}
}else if(an.media=="image"){// It is a OpenSeaDragon Annotation
if ( $("div#" + an.target.container).length) {
} else if (an.media === "image") { // It is a OpenSeaDragon Annotation
if ($("div#" + an.target.container).length) {
var isOpenViewer = typeof annotator.osda !== "undefined" && typeof annotator.osda.viewer !== "undefined";
function waitingOsda(){
isOpenViewer = typeof annotator.osda !== "undefined" && typeof annotator.osda.viewer !== "undefined";
if (typeof olditem == "undefined") {
if (typeof olditem === "undefined") {
olditem = item;
}
if (!isOpenViewer) {
setTimeout(waitingOsda,200);
setTimeout(waitingOsda, 200);
} else {
an = allannotations[olditem];
$(an.highlights).parent().find('.annotator-hl').removeClass('api');
......@@ -419,10 +425,19 @@ Annotator.Plugin.Share = (function(_super) {
if (typeof annotator !== 'undefined' && typeof annotator.osda !== 'undefined') {
var currentBounds = annotator.osda.viewer.drawer.viewport.getBounds();
var bounds = typeof an.bounds !== 'undefined' ? an.bounds : {};
if (typeof bounds.x !== 'undefined') currentBounds.x = bounds.x;
if (typeof bounds.y !== 'undefined') currentBounds.y = bounds.y;
if (typeof bounds.width !== 'undefined') currentBounds.width = bounds.width;
if (typeof bounds.height !== 'undefined') currentBounds.height = bounds.height;
if (typeof bounds.x !== 'undefined') {
currentBounds.x = bounds.x;
}
if (typeof bounds.y !== 'undefined') {
currentBounds.y = bounds.y;
}
if (typeof bounds.width !== 'undefined') {
currentBounds.width = bounds.width;
}
if (typeof bounds.height !== 'undefined') {
currentBounds.height = bounds.height;
}
annotator.osda.viewer.drawer.viewport.fitBounds(currentBounds);
}
// animate to the annotation
......@@ -449,12 +464,12 @@ Annotator.Plugin.Share = (function(_super) {
}
}
}
} else if (API.method === '2') {
} else if (parseInt(API.method, 10) === 2) {
if (typeof mplayer !== 'undefined') {
// variable for Video
var container = decodeURIComponent(API.container);
var player = mplayer[container];
var isVideo = (typeof player !== 'undefined' && container == player.id_);
var isVideo = (typeof player !== 'undefined' && container === player.id_);
var isNumber = (!isNaN(parseFloat(API.start)) && isFinite(API.start) && !isNaN(parseFloat(API.end)) && isFinite(API.end));
var isSource = false;
......@@ -462,9 +477,9 @@ Annotator.Plugin.Share = (function(_super) {
// Compare without extension
var src = decodeURIComponent(API.src);
var targetSrc = src.substring(0, src.lastIndexOf("."));
var playerSrc = (player.tech.options_.source.src == '') ? player.tag.currentSrc : player.tech.options_.source.src;
var playerSrc = (player.tech.options_.source.src === '') ? player.tag.currentSrc : player.tech.options_.source.src;
playerSrc = playerSrc.substring(0, playerSrc.lastIndexOf("."));
isSource = (targetSrc == playerSrc);
isSource = (targetSrc === playerSrc);
}
// Open Video Annotation
......@@ -485,7 +500,7 @@ Annotator.Plugin.Share = (function(_super) {
user: decodeURIComponent(API.user)
};
videojs(player.id_).ready(function(){
if (player.techName != 'Youtube'){
if (player.techName !== 'Youtube'){
player.preload('auto');
}
player.autoPlayAPI = annotation;
......@@ -498,7 +513,7 @@ Annotator.Plugin.Share = (function(_super) {
var endOffset = API.endOffset;
// Text Annotation
if (!isVideo && typeof startOffset != 'undefined' && typeof endOffset != 'undefined'){
if (!isVideo && typeof startOffset !== 'undefined' && typeof endOffset !== 'undefined') {
var annotation = {
ranges: [{
start: decodeURIComponent(API.start),
......@@ -518,8 +533,8 @@ Annotator.Plugin.Share = (function(_super) {
$(annotation.highlights).addClass('api');
// animate to the annotation
$('html, body').animate({
scrollTop: $(annotation.highlights[0]).offset().top},
'slow');
scrollTop: $(annotation.highlights[0]).offset().top
}, 'slow');
}
// variables for images
var Left = API.Left;
......@@ -571,10 +586,18 @@ Annotator.Plugin.Share = (function(_super) {
// change zoom
var currentBounds = annotator.osda.viewer.drawer.viewport.getBounds();
var bounds = typeof an.bounds !== 'undefined' ? an.bounds : {};
if (typeof bounds.x !== 'undefined') currentBounds.x = bounds.x;
if (typeof bounds.y !== 'undefined') currentBounds.y = bounds.y;
if (typeof bounds.width !== 'undefined') currentBounds.width = bounds.width;
if (typeof bounds.height !== 'undefined') currentBounds.height = bounds.height;
if (typeof bounds.x !== 'undefined') {
currentBounds.x = bounds.x;
}
if (typeof bounds.y !== 'undefined') {
currentBounds.y = bounds.y;
}
if (typeof bounds.width !== 'undefined') {
currentBounds.width = bounds.width;
}
if (typeof bounds.height !== 'undefined') {
currentBounds.height = bounds.height;
}
annotator.osda.viewer.drawer.viewport.fitBounds(currentBounds);
// animate to the annotation
$('html,body').animate({
......@@ -602,17 +625,17 @@ Annotator.Plugin.Share = (function(_super) {
.subscribe("annotationsLoaded", func);
}
Share.prototype._isVideo = function(an){
Share.prototype._isVideo = function(an) {
// Detect if the annotation is a Open Video Annotation
var an = an || {};
var rt = an.rangeTime;
var isVideo = (typeof an.media != 'undefined' && an.media == 'video');
var hasContainer = (typeof an.target != 'undefined' && typeof an.target.container != 'undefined' );
var isNumber = (typeof rt != 'undefined' && !isNaN(parseFloat(rt.start)) && isFinite(rt.start) && !isNaN(parseFloat(rt.end)) && isFinite(rt.end));
var isVideo = (typeof an.media !== 'undefined' && an.media === 'video');
var hasContainer = (typeof an.target !== 'undefined' && typeof an.target.container !== 'undefined' );
var isNumber = (typeof rt !== 'undefined' && !isNaN(parseFloat(rt.start)) && isFinite(rt.start) && !isNaN(parseFloat(rt.end)) && isFinite(rt.end));
return (isVideo && hasContainer && isNumber);
}
Share.prototype._isImage = function(annotation){
Share.prototype._isImage = function(annotation) {
var wrapper = $('.annotator-wrapper').parent()[0];
var annotator = window.annotator = $.data(wrapper, 'annotator');
var rp = an.rangePosition;
......@@ -627,7 +650,7 @@ Annotator.Plugin.Share = (function(_super) {
name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
var regex = new RegExp("[\\?&]" + name + "=([^&#]*)");
var results = regex.exec('?' + window.location.href.split('?')[1]);
return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
};
Share.prototype.removeVariableFromURL = function(url_string, variable_name) {
......@@ -651,7 +674,6 @@ Annotator.Plugin.Share = (function(_super) {
return self.buildHTMLShareButton('Share:', self.getSource('ovaId'));
});
// Create the actions for the buttons
this.buttonsActions(field[0], 1, this.options.baseUrl); // 1 is the method of the API that will be for share some annotation in the database
return ret;
......
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