metadataplayer: comparison src/js/widgets/createAnnotationWidget.js

Mercurial Mercurial > metadataplayer / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

src/js/widgets/createAnnotationWidget.js

branch	popcorn-port
changeset 842	4ae2247a59f4
parent 841	8da49ff273e0
child 852	eefb64f74a3f

equal deleted inserted replaced

-:8da49ff273e0
+:4ae2247a59f4
 "error_while_contacting": "An error happened while contacting the server. Your annotation has not been saved.",
 "empty_annotation": "Your annotation is empty. Please write something before submitting.",
 "annotation_saved": "Thank you, your annotation has been saved.",
 "share_annotation": "Would you like to share it on social networks ?",
 "share_on": "Share on",
-"moar_tags": "More tags"
+"more_tags": "More tags"
 },
 "fr": {
 "submit": "Envoyer",
 "add_keywords": "Ajouter des mots-clés",
 "add_polemic_keywords": "Ajouter des mots-clés polémiques",
 "error_while_contacting": "Une erreur s'est produite en contactant le serveur. Votre annotation n'a pas été enregistrée",
 "empty_annotation": "Votre annotation est vide. Merci de rédiger un texte avant de l'envoyer.",
 "annotation_saved": "Merci, votre annotation a été enregistrée.",
 "share_annotation": "Souhaitez-vous la partager sur les réseaux sociaux ?",
 "share_on": "Partager sur",
-"moar_tagz": "Plus de mots-clés"
+"more_tags": "Plus de mots-clés"
 }
 }
 );
 IriSP.createAnnotationWidget = function(Popcorn, config, Serializer) {
 IriSP.Widget.call(this, Popcorn, config, Serializer);
 this._hidden = true;
-this.checkOption("keywords");
-this.checkOption("polemic_mode", true);
-this.checkOption("polemics");
-this.checkOption("cinecast_version", false);
-this.checkOption("api_endpoint_template");
-this.checkOption("show_from_field", true);
-this.checkOption("api_method");
-this.checkOption("random_keywords");
-this.checkOption("disable_share", false);
 if (!IriSP.null_or_undefined(IriSP.user)) {
 if (!IriSP.null_or_undefined(IriSP.user.avatar)) {
 this.user_avatar = IriSP.user.avatar;
 }
 this.selector.find(".Ldt-SaKeywordText").text("");
 };
 IriSP.createAnnotationWidget.prototype.draw = function() {
 var _this = this;
-if (typeof this._config.remote_keywords != "undefined" && typeof this._config.remote_keywords) {
+if (typeof this.remote_tags == "object") {
-IriSP.jQuery.getJSON(this._config.remote_keywords, function(_json) {
+IriSP.jQuery.getJSON((typeof this.remote_tags.alias == "string" ? this.remote_tags.alias : this.remote_tags.url), function(_json) {
-_this.keywords = IriSP.underscore(_json.tags).map(function(_tag) {
+_this.tags = _json.tags;
-return _tag.meta.description;
-});
 _this.drawCallback();
 });
 } else {
 this.drawCallback();
 }
 this.selector.hide();
 else {
 this.showStartScreen();
 }
-if (this.random_keywords) {
+if (this.random_tags) {
 this.selector.find(".Ldt-createAnnotation-keywords li").hide();
-this.showMoarTagz();
+this.showMoreTags();
 this.selector.find('.Ldt-createAnnotation-moar-keywordz').click(function() {
-_this.showMoarTagz();
+_this.showMoreTags();
 })
 }
 // Add onclick event to both polemic and keywords buttons
 this.selector.find(".Ldt-createAnnotation-keyword-button, .Ldt-createAnnotation-polemic-button").click(function() {
 });
 // js_mod is a custom event because there's no simple way to test for a js
 // change in a textfield.
 this.selector.find(".Ldt-createAnnotation-Description")
-.bind("propertychange keyup input paste click js_mod", IriSP.wrap(this, this.handleTextChanges));
+.bind("propertychange keyup input paste click js_mod", IriSP.wrap(this, this.handleTextChanges))
+.keyup(function(_e) {
+console.log(_e);
+});
 /* the cinecast version of the player is supposed to pause when the user clicks on the button */
 /* the cinecast version expects the user to comment on a defined segment.
 As the widget is always shown, we need a way to update it's content as
 }
 ));
 }
 };
-IriSP.createAnnotationWidget.prototype.showMoarTagz = function() {
+IriSP.createAnnotationWidget.prototype.showMoreTags = function() {
-for (var j=0; j < this.random_keywords; j++) {
+for (var j=0; j < this.random_tags; j++) {
 var _jq = this.selector.find(".Ldt-createAnnotation-keywords li:hidden");
 if (_jq.length > 1) {
 IriSP.jQuery(_jq[Math.floor(_jq.length*Math.random())]).show();
 } else {
 _jq.show();
 var currentTime = this._Popcorn.currentTime();
 // block the arrow.
 this._Popcorn.trigger("IriSP.ArrowWidget.blockArrow");
-var duration = this._serializer.getDuration();
+var duration = this.getDuration();
 var currentChapter = this._serializer.currentChapitre(currentTime);
 if (IriSP.null_or_undefined(currentChapter)) {
 var left = this.selector.width() / 2;
 this.sliceWidth = params[1];
 };
 IriSP.createAnnotationWidget.prototype.sendLdtData = function(contents, callback) {
 var _this = this;
-var apiJson = {annotations : [{}], meta: {}};
+var apiJson = {
+format : "http://advene.org/ns/cinelab/",
+annotations : [
+{}
+],
+meta: {}};
 var annotation = apiJson.annotations[0];
-annotation.media = this._serializer.currentMedia()["id"];
+annotation.media = this.currentMedia()["id"];
 if (this.cinecast_version) {
 annotation.begin = Math.round(this._Popcorn.currentTime() * 1000);
 annotation.end = annotation.begin;
 } else {
-var duration = this._serializer.getDuration();
+var duration = this.getDuration();
 annotation.begin = +((duration * (this.sliceLeft / 100)).toFixed(0));
 annotation.end = +((duration * ((this.sliceWidth + this.sliceLeft) / 100)).toFixed(0));
 }
 // boundary checks
 annotation.begin = Math.max(0, annotation.begin);
-annotation.end = Math.min(this._serializer.getDuration(), annotation.end);
+annotation.end = Math.min(this.getDuration(), annotation.end);
 annotation.type = ( this.cinecast_version ? "cinecast:UserAnnotation" : ( this._serializer.getContributions() || "" ));
 if (typeof(annotation.type) === "undefined")
 annotation.type = "";
 )
 );
 meta.created = Date().toString();
-// All #hashtags are added to tags
+var _tags = [];
-var _tags = contents.toLowerCase().match(/#[^#\s]+\b/gim) || [];
+IriSP._(this.tags).each(function(_v) {
-this.selector.find('.Ldt-createAnnotation-keyword-button').each(function() {
+var _rx = IriSP.regexpFromText(_v.meta.description);
-var _tx = IriSP.jQuery(this).text(),
-_rx = IriSP.regexpFromText(_tx);
 if (_rx.test(contents)) {
-_tags.push(_tx.toLowerCase())
+_tags.push(_v.id);
 }
 });
+if (typeof this.remote_tags == "object") {
+_tags = IriSP._(_tags).map(function(_t) {
+return _this.remote_tags.id + ':' + _t
+});
+if (typeof apiJson.imports == "undefined") {
+apiJson.imports = [];
+}
+apiJson.imports.push({
+"id" : this.remote_tags.id,
+"url" : this.remote_tags.url
+})
+}
 annotation.tags = IriSP.underscore.uniq(_tags);
 var jsonString = JSON.stringify(apiJson);
 var project_id = this._serializer._data.meta.id;
 //TODO: extract magic url
 annotation.is_new = true;
 // everything is shared so there's no need to propagate the change
 _this._serializer._data.annotations.push(annotation);
 _this._Popcorn.trigger("IriSP.createAnnotationWidget.addedAnnotation", annotation);
+this.selector.find(".Ldt-createAnnotation-Description").val("");
 callback(annotation);
 }),
 error:
 function(jqXHR, textStatus, errorThrown) {
 console.log("an error occured while contacting "

metadataplayer