demo_player: comparison web/LdtPlayer-release.js

Mercurial Mercurial > demo_player / comparison

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

web/LdtPlayer-release.js

changeset 22	11011b712cf2
parent 17	283abdcf7134
child 23	44945db9746a

equal deleted inserted replaced

-:ec676b63b663
+:11011b712cf2
 var i = 0;
 for(i = 0; i < IriSP.PopcornReplacement.__codes.length; i++) {
 var c = IriSP.PopcornReplacement.__codes[i];
 if (pos >= c.start && pos < c.end &&
 pos - 0.1 <= c.start) {
 c.onStart();
 }
-if (pos >= c.start && pos >= c.end &&
+if (pos > c.start && pos > c.end &&
 pos - 0.1 <= c.end) {
+console.log("eonedn");
 c.onEnd();
 }
 }
 IriSP.PopcornReplacement.trigger("timeupdate");
 };
 IriSP.PopcornReplacement.__seekHandler = function(event) {
 var i = 0;
 for(i = 0; i < IriSP.PopcornReplacement.__codes.length; i++) {
 var c = IriSP.PopcornReplacement.__codes[i];
 if (event.position >= c.start && event.position < c.end) {
 c.onEnd();
 }
+}
+for(i = 0; i < IriSP.PopcornReplacement.__codes.length; i++) {
+var c = IriSP.PopcornReplacement.__codes[i];
 if (typeof(event.offset) === "undefined")
 event.offset = 0;
-if (event.offset >= c.start && event.offset < c.end) {
+if (event.offset >= c.start && event.offset < c.end) {
 c.onStart();
 }
 }
 e.title = frames[i].mytweetsID[k].title;
 e.id = frames[i].mytweetsID[k].cinecast_id;
 this.svgElements[e.id] = e;
+/*
 e.mouseover(function(element) { return function (event) {
 // event.clientX and event.clientY are to raphael what event.pageX and pageY are to jquery.
 self.TooltipWidget.show.call(self.TooltipWidget, element.title, element.attr("fill"), event.clientX - 106, event.clientY - 160);
 element.displayed = true;
 }}(e)).mouseout(function(element) { return function () {
 self.TooltipWidget.hide.call(self.TooltipWidget);
 }}(e)).mousedown(function () {
 self._Popcorn.currentTime(this.time/1000);
 self._Popcorn.trigger("IriSP.PolemicTweet.click", this.id);
 });
+*/
+IriSP.jQuery(e.node).mouseenter(function(element) { return function (event) {
+// event.clientX and event.clientY are to raphael what event.pageX and pageY are to jquery.
+self.TooltipWidget.show.call(self.TooltipWidget, element.title, element.attr("fill"), event.clientX - 106, event.clientY - 160);
+element.displayed = true;
+}}(e)).mouseleave(function(element) { return function () {
+self.TooltipWidget.hide.call(self.TooltipWidget);
+}}(e)).mousedown(function () {
+self._Popcorn.currentTime(this.time/1000);
+self._Popcorn.trigger("IriSP.PolemicTweet.click", this.id);
+});
 IriSP.jQuery(e.node).attr('id', 't' + k + '');
 IriSP.jQuery(e.node).attr('title', frames[i].mytweetsID[k].title);
 IriSP.jQuery(e.node).attr('begin',  frames[i].mytweetsID[k].timeframe);
 }
 var begin = Math.round((+ annotation.begin) / 1000);
 var end = Math.round((+ annotation.end) / 1000);
 var duration = this._serializer.currentMedia().meta["dc:duration"] / 1000;
 var id = annotation.id;
-var startPourcent 	= IriSP.timeToPourcent(begin, duration);
+var startPourcent 	= IriSP.timeToPourcent(begin, duration) + onePxPercent;
 /* some sort of collapsing occurs, so we only have to substract one pixel to each box instead of
 two
 */
 var endPourcent 	= IriSP.timeToPourcent(end, duration) - startPourcent - onePxPercent * 1.5;
 this.sliderMaximized = true;
 this.sliderBackground.animate({"height": "9px"}, 100);
 this.sliderForeground.animate({"height": "9px"}, 100);
-this.positionMarker.animate({"height": "9px", "width": "9px", "margin-top": "-4px"}, 100);
+this.positionMarker.animate({"height": "9px", "width": "9px"}, 100);
+this.positionMarker.css("margin-top", "-4px");
 //  this.selector.removeClass("Ldt-SliderMinimized");
 //  this.selector.addClass("Ldt-SliderMaximized");
 };
 };
 IriSP.SliderWidget.prototype.minimizeOnTimeout = function(event) {
 this.sliderBackground.animate({"height": "5px"}, 100);
 this.sliderForeground.animate({"height": "5px"}, 100);
-this.positionMarker.animate({"height": "5px", "width": "5px", "margin-top": "0px"}, 100);
+this.positionMarker.animate({"height": "5px", "width": "5px"}, 100);
+this.positionMarker.css("margin-top", "0px");
 this.sliderMinimized = true;
 //  this.selector.removeClass("Ldt-SliderMaximized");
 //  this.selector.addClass("Ldt-SliderMinimized");
 /* this widget displays a small tooltip */
 IriSP.TooltipWidget = function(Popcorn, config, Serializer) {
 IriSP.Widget.call(this, Popcorn, config, Serializer);
 this._shown = false;
+this._displayedText = "";
+this._hideTimeout = -1;
 };
 IriSP.TooltipWidget.prototype = new IriSP.Widget();
 IriSP.TooltipWidget.prototype.clear = function() {
 	this.selector.find(".tiptext").text("");
 };
 IriSP.TooltipWidget.prototype.show = function(text, color, x, y) {
-if (this._shown === true || this.selector.find(".tiptext").text() == text)
+if (this._shown === true || this._displayedText == text)
 return;
+// cancel the timeout for the previously displayed element.
+if (this._hideTimeout != -1) {
+window.clearTimeout(this._hideTimeout);
+this._hideTimeout = -1;
+console.log(text === this._displayedText);
+}
+debugger;
 this.selector.find(".tipcolor").css("background-color", color);
+this._displayedText = text;
 	this.selector.find(".tiptext").text(text);
-this.selector.find(".tip").css("left", x).css("top", y);
+//this.selector.find(".tip").css("left", x).css("top", y);
+this.selector.find(".tip").css("left", x).css("top", "-160px");
+this.selector.find(".tip").show();
+this._shown = true;
+};
+IriSP.TooltipWidget.prototype.hide = function() {
+this._hideTimeout = window.setTimeout(IriSP.wrap(this, function() {
+this.selector.find(".tip").hide();
+this._shown = false; }), 1000);
-this._shown = true;
-};
-IriSP.TooltipWidget.prototype.hide = function() {
-this.clear();
-this.selector.find(".tip").css("left", -10000).css("top", -100000);
-this._shown = false;
 };
 /* a widget that displays tweet - used in conjunction with the polemicWidget */
 IriSP.TweetsWidget = function(Popcorn, config, Serializer) {
 IriSP.Widget.call(this, Popcorn, config, Serializer);

demo_player