')
+ .addClass("Ldt-Slice")
+
+ this.$.append(this.$slider);
+
+ this.min = 0;
+ this.max = this.source.getDuration().getSeconds();
+
+ var _this = this;
+
+ this.$slider.slider({
+ range: true,
+ values: [0, 0],
+ min: 0,
+ max: this.max,
+ change: function(event, ui) {
+ _this.player.popcorn.trigger("IriSP.Arrow.updatePosition",{
+ widget:_this.type,
+ time:Math.floor((ui.values[0]+ui.values[1])*500)
+ });
+ _this.player.popcorn.trigger("IriSP.Slice.valuesChanged",[ui.values[0]*1000, ui.values[1]*1000]);
+ }
+ });
+ this.$slider.find(".ui-slider-handle:first").addClass("Ldt-Slice-left-handle");
+ this.$slider.find(".ui-slider-handle:last").addClass("Ldt-Slice-right-handle");
+ if (this.start_visible) {
+ this.show();
+ } else {
+ this.hide();
+ }
+ this.bindPopcorn("IriSP.Slice.show","show");
+ this.bindPopcorn("IriSP.Slice.hide","hide");
+ this.bindPopcorn("IriSP.Annotation.boundsChanged","storeBounds")
+};
+
+IriSP.Widgets.Slice.prototype.show = function() {
+ this.$slider.show();
+ this.player.popcorn.trigger("IriSP.Arrow.takeover",this.type);
+ this.$slider.slider("values", [this.min, this.max]);
+}
+
+IriSP.Widgets.Slice.prototype.hide = function() {
+ this.$slider.hide();
+ this.player.popcorn.trigger("IriSP.Arrow.release");
+}
+
+IriSP.Widgets.Slice.prototype.storeBounds = function(_values) {
+ this.min = Math.floor(_values[0]/1000);
+ this.max = Math.floor(_values[1]/1000);
+}
\ No newline at end of file
diff -r 03967b6ada7c -r 4c7b33bf2795 src/widgets/Slider.js
--- a/src/widgets/Slider.js Tue Apr 24 20:25:40 2012 +0200
+++ b/src/widgets/Slider.js Thu Apr 26 19:18:57 2012 +0200
@@ -50,7 +50,9 @@
};
IriSP.Widgets.Slider.prototype.onTimeupdate = function() {
- this.$slider.slider("value",this.player.popcorn.currentTime());
+ var _time = this.player.popcorn.currentTime();
+ this.$slider.slider("value",_time);
+ this.player.popcorn.trigger("IriSP.Arrow.updatePosition",{widget: this.type, time: 1000 * _time});
}
IriSP.Widgets.Slider.prototype.onMouseover = function() {
diff -r 03967b6ada7c -r 4c7b33bf2795 src/widgets/Tagcloud.css
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/widgets/Tagcloud.css Thu Apr 26 19:18:57 2012 +0200
@@ -0,0 +1,32 @@
+/*
+ *
+ */
+.Ldt-Tagcloud-Container {
+ font-family: "Open Sans", Arial, Helvetica, sans-serif;
+ border: 1px solid #b7b7b7;
+ padding: 1px;
+ margin: 0;
+}
+
+ul.Ldt-Tagcloud-List {
+ background: url(img/pinstripe.png);
+ padding: 5px;
+ margin: 0;
+ list-style: none;
+ text-align: center;
+}
+
+li.Ldt-Tagcloud-item {
+ display: inline-block;
+ margin: 2px;
+ cursor: pointer;
+}
+
+li.Ldt-Tagcloud-item:hover {
+ color: #0099ff;
+}
+
+.Ldt-Tagcloud-active {
+ color: #c000c0;
+ padding: 0; margin: 0;
+}
\ No newline at end of file
diff -r 03967b6ada7c -r 4c7b33bf2795 src/widgets/Tagcloud.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/widgets/Tagcloud.js Thu Apr 26 19:18:57 2012 +0200
@@ -0,0 +1,101 @@
+IriSP.Widgets.Tagcloud = function(player, config) {
+ IriSP.Widgets.Widget.call(this, player, config);
+ this.stopwords = IriSP._.uniq(IriSP._.extend([], this.custom_stopwords, this.stopword_lists[this.stopword_language]));
+}
+
+IriSP.Widgets.Tagcloud.prototype = new IriSP.Widgets.Widget();
+
+IriSP.Widgets.Tagcloud.prototype.template =
+ '
'
+ + '{{#words}}- {{word}}
{{/words}}'
+ + '
';
+
+IriSP.Widgets.Tagcloud.prototype.defaults = {
+ include_titles: true,
+ include_descriptions: true,
+ tag_count: 30,
+ stopword_language: "fr",
+ custom_stopwords: [],
+ exclude_pattern: false,
+ annotation_type: false,
+ min_font_size: 10,
+ max_font_size: 26
+}
+
+IriSP.Widgets.Tagcloud.prototype.stopword_lists = {
+ "fr" : [
+ 'aussi', 'avec', 'aux', 'bien', 'car', 'cette', 'comme', 'dans', 'des', 'donc', 'dont', 'elle', 'encore', 'entre', 'est',
+ 'être', 'eux', 'faire', 'fait', 'http', 'ici', 'ils', 'les', 'leur', 'leurs', 'mais', 'mes', 'même', 'mon', 'notre',
+ 'non', 'nos', 'nous', 'ont', 'par', 'pas', 'peu', 'peut', 'plus', 'pour', 'quand', 'que', 'qui', 'quoi', 'sans',
+ 'ses' ,'son', 'sont', 'sur', 'tes', 'très', 'the', 'ton', 'tous', 'tout', 'une', 'votre', 'vos', 'vous'
+ ],
+ "en" : [
+ 'about', 'again', 'are', 'and', 'because', 'being', 'but', 'can', 'done', 'have', 'for', 'from',
+ 'get', 'here', 'http', 'like', 'more', 'one', 'our', 'she', 'that', 'the', 'their', 'then', 'there',
+ 'they', 'this', 'very', 'what', 'when', 'where', 'who', 'why', 'will', 'with', 'www', 'you', 'your'
+ ]
+}
+
+IriSP.Widgets.Tagcloud.prototype.draw = function() {
+
+ var _urlRegExp = /https?:\/\/[0-9a-zA-Z\.%\/-_]+/g,
+ _regexpword = /[^\s\.&;,'"!\?\d\(\)\+\[\]\\\…\-«»:\/]{3,}/g,
+ _words = {},
+ _this = this;
+ this.getWidgetAnnotations().forEach(function(_annotation) {
+ var _txt = (_this.include_titles ? _annotation.title : '') + ' ' + (_this.include_descriptions ? _annotation.description : '');
+ IriSP._(_txt.toLowerCase().replace(_urlRegExp, '').match(_regexpword)).each(function(_word) {
+ if (IriSP._(_this.stopwords).indexOf(_word) == -1 && (!_this.exclude_pattern || !_this.exclude_pattern.test(_word))) {
+ _words[_word] = 1 + (_words[_word] || 0);
+ }
+ })
+ });
+ _words = IriSP._(_words)
+ .chain()
+ .map(function(_v, _k) {
+ return {
+ "word" : _k,
+ "count" : _v
+ }
+ })
+ .filter(function(_v) {
+ return _v.count > 2;
+ })
+ .sortBy(function(_v) {
+ return - _v.count;
+ })
+ .first(this.tag_count)
+ .value();
+ var _max = _words[0].count,
+ _min = Math.min(_words[_words.length - 1].count, _max - 1),
+ _scale = (this.max_font_size - this.min_font_size) / Math.sqrt(_max - _min);
+ IriSP._(_words).each(function(_word) {
+ _word.size = Math.floor( _this.min_font_size + _scale * Math.sqrt(_word.count - _min) );
+ });
+ this.words = _words;
+ this.renderTemplate();
+ this.$words = this.$.find(".Ldt-Tagcloud-item");
+ this.$words.click(function() {
+ var _txt = IriSP.jQuery(this).attr("content");
+ _this.player.popcorn.trigger("IriSP.search.triggeredSearch", _txt);
+ });
+ this.bindPopcorn("IriSP.search", "onSearch");
+ this.bindPopcorn("IriSP.search.closed", "onSearch");
+ this.bindPopcorn("IriSP.search.cleared", "onSearch");
+}
+
+IriSP.Widgets.Tagcloud.prototype.onSearch = function(searchString) {
+ searchString = typeof searchString !== "undefined" ? searchString : '';
+ if (searchString) {
+ var _rgxp = IriSP.Model.regexpFromTextOrArray(searchString);
+ }
+ this.$words.each(function() {
+ var _el = IriSP.jQuery(this),
+ _txt = _el.attr("content");
+ if (searchString) {
+ _el.html(_txt.replace(_rgxp, '
$1'));
+ } else {
+ _el.html(_txt);
+ }
+ });
+}
diff -r 03967b6ada7c -r 4c7b33bf2795 src/widgets/Tweet.css
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/widgets/Tweet.css Thu Apr 26 19:18:57 2012 +0200
@@ -0,0 +1,105 @@
+.Ldt-Tweet-Widget {
+ border: 1px solid #b7b7b7;
+ padding: 1px;
+ margin: 0;
+ font-family: Helvetica, Arial, sans-serif;
+}
+
+.Ldt-Tweet-Inner {
+ background: url(img/pinstripe.png);
+ padding: 5px;
+ margin: 0;
+ min-height: 50px;
+}
+
+.Ldt-Tweet-PinClose-Buttons {
+ float: right;
+}
+
+.Ldt-Tweet-PinClose-Buttons a {
+ display: inline-block; width: 17px; height: 17px; margin: 2px;
+ background: url(img/widget-control.png);
+}
+
+a.Ldt-Tweet-Pin {
+ background-position: 0 -17px;
+}
+
+a.Ldt-Tweet-Pin:hover, a.Ldt-Tweet-Pin.active {
+ background-position: -17px -17px;
+}
+
+a.Ldt-Tweet-Pin.active:hover {
+ background-position: 0 -17px;
+}
+
+a.Ldt-Tweet-Close:hover {
+ background-position: -17px 0;
+}
+
+.Ldt-Tweet-AvatarContainer {
+ float: left; width: 48px; height: 48px; margin: 2px 4px 2px 0;
+}
+
+.Ldt-Tweet-Avatar {
+ border: none; width: 48px; height: 48px;
+}
+
+.Ldt-Tweet-Inner h3 {
+ margin: 2px 0 5px 52px;
+ font-size: 14px;
+}
+
+a.Ldt-Tweet-ScreenName {
+ color: #0068c4;
+ text-decoration: none;
+}
+
+a.Ldt-Tweet-ScreenName:hover {
+ color: #000000;
+ text-decoration: underline;
+}
+
+p.Ldt-Tweet-Contents {
+ margin: 5px 0 5px 52px;
+ font-size: 12px;
+}
+
+.Ldt-Tweet-Bottom {
+ margin: 5px 0 0;
+ font-size: 12px;
+ text-align: right;
+}
+
+.Ldt-Tweet-Time {
+ display: inline-block;
+}
+
+.Ldt-Tweet-Bottom a {
+ display: inline-block;
+ margin-left: 12px;
+ color: #000000;
+ text-decoration: none;
+}
+
+.Ldt-Tweet-Bottom a:hover {
+ text-decoration: underline;
+}
+
+.Ldt-Tweet-Icon {
+ display: inline-block; width: 16px; height: 16px;
+ margin: 0 2px -2px;
+ background: url(img/twitter_sprites.png);
+}
+
+.Ldt-Tweet-Retweet .Ldt-Tweet-Icon {
+ background-position: -80px 0;
+}
+
+.Ldt-Tweet-Retweet:hover .Ldt-Tweet-Icon {
+ background-position: -96px 0;
+}
+
+.Ldt-Tweet-Reply:hover .Ldt-Tweet-Icon {
+ background-position: -16px 0;
+}
\ No newline at end of file
diff -r 03967b6ada7c -r 4c7b33bf2795 src/widgets/Tweet.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/widgets/Tweet.js Thu Apr 26 19:18:57 2012 +0200
@@ -0,0 +1,196 @@
+IriSP.Widgets.Tweet = function(player, config) {
+ IriSP.Widgets.Widget.call(this, player, config);
+ this.lastAnnotation = false;
+};
+
+IriSP.Widgets.Tweet.prototype = new IriSP.Widgets.Widget();
+
+IriSP.Widgets.Tweet.prototype.defaults = {
+ hide_timeout: 5000,
+ polemics : [
+ {
+ "keywords" : [ "++" ],
+ "description" : "positif",
+ "color" : "#30d765"
+ },
+ {
+ "keywords" : [ "--" ],
+ "description" : "negatif",
+ "color" : "#f51123"
+ },
+ {
+ "keywords" : [ "==" ],
+ "description" : "reference",
+ "color" : "#f1e24a"
+ },
+ {
+ "keywords" : [ "??" ],
+ "description" : "question",
+ "color" : "#05aae6"
+ }
+ ]
+}
+
+IriSP.Widgets.Tweet.prototype.messages = {
+ "fr": {
+ retweet: "Retweeter",
+ reply: "Répondre",
+ keep_visible: "Garder visible",
+ dont_keep_visible: "Permettre la fermeture automatique",
+ close_widget: "Fermer l'affichage du tweet",
+ original_time: "Heure d'envoi ",
+ video_time: "Temps de la vidéo : "
+ },
+ "en": {
+ retweet: "Retweet",
+ reply: "Reply",
+ keep_visible: "Keep visible",
+ dont_keep_visible: "Don't keep visible",
+ close_widget: "Close tweet display",
+ original_time: "Tweet sent at: ",
+ video_time: "Video time: "
+ }
+}
+
+IriSP.Widgets.Tweet.prototype.template =
+ '';
+
+
+IriSP.Widgets.Tweet.prototype.draw = function() {
+ this.renderTemplate();
+ this.bindPopcorn("IriSP.Tweet.show","show");
+ this.pinned = false;
+ var _this = this;
+ this.$.find(".Ldt-Tweet-Pin").click(function() {
+ _this.pinned = !_this.pinned;
+ var _el = IriSP.jQuery(this)
+ if (_this.pinned) {
+ _el.addClass("active").attr("title",_this.l10n.dont_keep_visible);
+ _this.cancelTimeout();
+ } else {
+ _el.removeClass("active").attr("title",_this.l10n.keep_visible);
+ _this.hideTimeout();
+ }
+ });
+ this.$.find(".Ldt-Tweet-Close").click(function() {
+ _this.hide();
+ });
+ this.$.hide();
+}
+
+IriSP.Widgets.Tweet.prototype.show = function(_id) {
+ var _tweet = this.source.getElement(_id);
+ if (typeof _tweet !== "undefined" && typeof _tweet.source !== "undefined") {
+ var _entities = [];
+ for (var _i = 0; _i < _tweet.source.entities.hashtags.length; _i++) {
+ var _hash = _tweet.source.entities.hashtags[_i];
+ _entities.push({
+ is_link: true,
+ text: '#' + _hash.text,
+ url: 'http://twitter.com/search?q=%23' + encodeURIComponent(_hash.text),
+ indices: _hash.indices
+ });
+ }
+ for (var _i = 0; _i < _tweet.source.entities.urls.length; _i++) {
+ var _url = _tweet.source.entities.urls[_i],
+ _displayurl = (typeof _url.display_url !== "undefined" && _url.display_url !== null ? _url.display_url : _url.url),
+ _linkurl = (typeof _url.expanded_url !== "undefined" && _url.expanded_url !== null ? _url.expanded_url : _url.url);
+ _displayurl = _displayurl.replace(/^\w+:\/\//,'');
+ if (!/^\w+:\/\//.test(_linkurl)) {
+ _linkurl = 'http://' + _linkurl;
+ }
+ _entities.push({
+ is_link: true,
+ text: _displayurl,
+ url: _linkurl,
+ indices: _url.indices
+ });
+ }
+ for (var _i = 0; _i < _tweet.source.entities.user_mentions.length; _i++) {
+ var _user = _tweet.source.entities.user_mentions[_i];
+ _entities.push({
+ is_link: true,
+ text: '@' + _user.screen_name,
+ url: 'http://twitter.com/' + encodeURIComponent(_user.screen_name),
+ indices: _user.indices
+ });
+ }
+ for (var _i = 0; _i < this.polemics.length; _i++) {
+ for (var _j = 0; _j < this.polemics[_i].keywords.length; _j++) {
+ var _p = _tweet.source.text.indexOf(this.polemics[_i].keywords[_j]);
+ while (_p !== -1) {
+ var _end = (_p + this.polemics[_i].keywords[_j].length);
+ _entities.push({
+ is_link: false,
+ text: this.polemics[_i].keywords[_j],
+ color: this.polemics[_i].color,
+ indices: [_p, _end]
+ });
+ _p = _tweet.source.text.indexOf(this.polemics[_i].keywords[_j], _end);
+ }
+ }
+ }
+ _entities = IriSP._(_entities).sortBy(function(_entity) {
+ return _entity.indices[0];
+ });
+ var _currentPos = 0,
+ _txt = '';
+ for (var _i = 0; _i < _entities.length; _i++) {
+ if (_entities[_i].indices[0] >= _currentPos) {
+ _txt += _tweet.source.text.substring(_currentPos, _entities[_i].indices[0]);
+ _currentPos = _entities[_i].indices[1];
+ if (_entities[_i].is_link) {
+ _txt += '
';
+ } else {
+ _txt += '';
+ }
+ _txt += _entities[_i].text;
+ if (_entities[_i].is_link) {
+ _txt += '';
+ } else {
+ _txt += '';
+ }
+ }
+ }
+ _txt += _tweet.source.text.substring(_currentPos);
+ this.$.find(".Ldt-Tweet-Avatar").attr("src",_tweet.source.user.profile_image_url);
+ this.$.find(".Ldt-Tweet-ScreenName").html('@'+_tweet.source.user.screen_name);
+ this.$.find(".Ldt-Tweet-ProfileLink").attr("href", "http://twitter.com/" + _tweet.source.user.screen_name);
+ this.$.find(".Ldt-Tweet-FullName").html(_tweet.source.user.name);
+ this.$.find(".Ldt-Tweet-Contents").html(_txt);
+ this.$.find(".Ldt-Tweet-Time").html(this.l10n.original_time + new Date(_tweet.source.created_at).toLocaleTimeString() + " / " + this.l10n.video_time + _tweet.begin.toString());
+ this.player.popcorn.trigger("IriSP.Annotation.minimize");
+ this.$.slideDown();
+ this.cancelTimeout();
+ if (!this.pinned) {
+ this.hideTimeout();
+ }
+ } else {
+ this.hide();
+ }
+}
+
+IriSP.Widgets.Tweet.prototype.hide = function() {
+ this.player.popcorn.trigger("IriSP.Annotation.maximize");
+ this.$.slideUp();
+ this.cancelTimeout();
+}
+
+IriSP.Widgets.Tweet.prototype.cancelTimeout = function() {
+ if (typeof this.hide_timer !== "undefined") {
+ window.clearTimeout(this.hide_timer);
+ this.hide_timer = undefined;
+ }
+}
+
+IriSP.Widgets.Tweet.prototype.hideTimeout = function() {
+ this.cancelTimeout();
+ this.hide_timer = window.setTimeout(this.functionWrapper("hide"), this.hide_timeout);
+}
diff -r 03967b6ada7c -r 4c7b33bf2795 src/widgets/img/slice-handles.png
Binary file src/widgets/img/slice-handles.png has changed
diff -r 03967b6ada7c -r 4c7b33bf2795 src/widgets/img/widget-control.png
Binary file src/widgets/img/widget-control.png has changed
diff -r 03967b6ada7c -r 4c7b33bf2795 test/integration/polemic.htm
--- a/test/integration/polemic.htm Tue Apr 24 20:25:40 2012 +0200
+++ b/test/integration/polemic.htm Thu Apr 26 19:18:57 2012 +0200
@@ -25,7 +25,7 @@
IriSP.widgetsDir = "/metadataplayer/src/widgets"
IriSP.jwplayer_swf_path = "../libs/player.swf";
var _metadata = {
- url: 'http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/cljson/id/f1a17368-2bc8-11e1-b21a-00145ea49a02?callback=?',
+ url: 'http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/cljson/id/13b0aa52-336b-11e0-b233-00145ea49a02?callback=?',
format: 'ldt'
};
var _config = {
@@ -91,18 +91,28 @@
type: "Segments"
},
{
+ type: "Slice"
+ },
+ {
type: "Arrow"
},
{
type: "Annotation"
},
{
+ type: "Tweet"
+ },
+ {
+ type: "Tagcloud"
+ },
+ {
type: "AnnotationsList",
//ajax_url : "http://ldt.iri.centrepompidou.fr/ldtplatform/api/ldt/segments/{{media}}/{{begin}}/{{end}}?callback=?",
foreign_url : "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/{{media}}/{{project}}/{{annotationType}}#id={{annotation}}",
annotation_type : "tweet",
container: "AnnotationsListContainer"
- }
+ },
+ { type: "Mediafragment"}
]
},
player:{
'
+ + ' {{/user_avatar}}'
+ + ' {{#user_avatar}} 
'
+ + ' {{/user_avatar}}'
+ + '