1) {
- tweet_annot_type = view.annotation_types[1];
- }
-
- for(var i = 0; i < json.annotations.length; i++) {
- var item = json.annotations[i];
- var MyTime = Math.floor(item.begin/duration*lineSize);
- var Myframe = Math.floor(MyTime/lineSize*frameLength);
+ function loaded_callback (json) {
- if (typeof(item.meta) !== "undefined"
- && typeof(item.meta["id-ref"]) !== "undefined"
- && item.meta["id-ref"] === tweet_annot_type) {
-
- var MyTJson = JSON.parse(item.meta['dc:source']['content']);
+ // get current view (the first ???)
+ view = json.views[0];
- if (item.content['polemics'] != undefined
- && item.content['polemics'][0] != null) {
-
+ // the tweets are by definition of the second annotation type FIXME ?
+ tweet_annot_type = null;
+ if(typeof(view.annotation_types) !== "undefined" && view.annotation_types.length > 1) {
+ tweet_annot_type = view.annotation_types[1];
+ }
+
+ for(var i = 0; i < json.annotations.length; i++) {
+ var item = json.annotations[i];
+ var MyTime = Math.floor(item.begin/duration*lineSize);
+ var Myframe = Math.floor(MyTime/lineSize*frameLength);
+
+ if (typeof(item.meta) !== "undefined"
+ && typeof(item.meta["id-ref"]) !== "undefined"
+ && item.meta["id-ref"] === tweet_annot_type) {
+
+ var MyTJson = JSON.parse(item.meta['dc:source']['content']);
- for(var j=0; j
max) {
- max = moy;
- }
- }
-
- var tweetDrawed = new Array();
- var TweetHeight = 5;
- // DRAW TWEETS ============================================
- for(var i = 0; i < nbrframes; i++) {
- var addEheight = 5;
- if (frames[i] != undefined){
- // by type
+ // GROUPES TWEET ============================================
+ // max of tweet by Frame
+ var max = 0;
+ for(var i = 0; i < nbrframes; i++) {
+ var moy = 0;
+ for (var j = 0; j < 6; j++) {
+ if (frames[i] != undefined) {
+ if (frames[i].qualifVol[j] != undefined) {
+ moy += frames[i].qualifVol[j];
+ }
+ }
+ }
- for (var j = 6; j > -1; j--) {
- if (frames[i].qualifVol[j] != undefined) {
- // show tweet by type
- for (var k = 0; k < frames[i].mytweetsID.length; k++) {
-
- if (frames[i].mytweetsID[k].qualification == j) {
- var x = i * frameSize;
- var y = this.heightmax - addEheight;
-
- if (this.yMax > y) {
- this.yMax = y;
+ if (moy > max) {
+ max = moy;
+ }
+ }
+
+ var tweetDrawed = new Array();
+ var TweetHeight = 5;
+
+ // DRAW TWEETS ============================================
+ for(var i = 0; i < nbrframes; i++) {
+ var addEheight = 5;
+ if (frames[i] != undefined){
+ // by type
+
+ for (var j = 6; j > -1; j--) {
+ if (frames[i].qualifVol[j] != undefined) {
+ // show tweet by type
+ for (var k = 0; k < frames[i].mytweetsID.length; k++) {
+
+ if (frames[i].mytweetsID[k].qualification == j) {
+ var x = i * frameSize;
+ var y = this.heightmax - addEheight;
+
+ if (this.yMax > y) {
+ this.yMax = y;
+ }
+
+ var e = this.paper.rect(x, y, frameSize - margin, TweetHeight /* height */).attr({stroke:"#00","stroke-width":0.1, fill: colors[j]});
+ this.svgElements.push(e);
+
+ addEheight += TweetHeight;
+
+ e.time= frames[i].mytweetsID[k].timeframe;
+ e.title= frames[i].mytweetsID[k].title;
+
+ 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;
+ debugger;
+ }}(e)).mouseout(function(element) { return function () {
+ self.TooltipWidget.hide.call(self.TooltipWidget);
+ }}(e)).mousedown(function () {
+ self._Popcorn.currentTime(this.time/1000);
+ });
+
+ 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 e = this.paper.rect(x, y, frameSize - margin, TweetHeight /* height */).attr({stroke:"#00","stroke-width":0.1, fill: colors[j]});
- this.svgElements.push(e);
-
- addEheight += TweetHeight;
-
- e.time= frames[i].mytweetsID[k].timeframe;
- e.title= frames[i].mytweetsID[k].title;
-
- 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;
- debugger;
- }}(e)).mouseout(function(element) { return function () {
- self.TooltipWidget.hide.call(self.TooltipWidget);
- }}(e)).mousedown(function () {
- self._Popcorn.currentTime(this.time/1000);
- });
-
- 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);
}
}
}
}
- }
- }
- // DRAW UI :: resize border and bgd
- this.paperBackground = this.paper.rect(0, 0, this.width, this.heightmax).attr({fill:"#F8F8F8","stroke-width":0.1,opacity: 1});
- // var PaperBorder = this.paper.rect(0, this.yMax,this.width,1).attr({fill:"#fff",stroke: "none",opacity: 1});
-
- this.paperSlider = this.paper.rect(0, 0, 0, this.heightmax).attr({fill:"#D4D5D5", stroke: "none", opacity: 1});
-
- // the small white line displayed over the slider.
- this.sliderTip = this.paper.rect(0, 0, 1, this.heightmax).attr({fill:"#fc00ff", stroke: "none", opacity: 1});
-
- // decalage
- // tweetSelection = this.paper.rect(-100,-100,5,5).attr({fill:"#fff",stroke: "none",opacity: 1});
-
+ }
+ // DRAW UI :: resize border and bgd
+ this.paperBackground = this.paper.rect(0, 0, this.width, this.heightmax).attr({fill:"#F8F8F8","stroke-width":0.1,opacity: 1});
+ // var PaperBorder = this.paper.rect(0, this.yMax,this.width,1).attr({fill:"#fff",stroke: "none",opacity: 1});
+
+ this.paperSlider = this.paper.rect(0, 0, 0, this.heightmax).attr({fill:"#D4D5D5", stroke: "none", opacity: 1});
+
+ // the small white line displayed over the slider.
+ this.sliderTip = this.paper.rect(0, 0, 1, this.heightmax).attr({fill:"#fc00ff", stroke: "none", opacity: 1});
+
+ // decalage
+ // tweetSelection = this.paper.rect(-100,-100,5,5).attr({fill:"#fff",stroke: "none",opacity: 1});
+
+
+ this.paperSlider.toBack();
+ this.paperBackground.toBack();
+ this.sliderTip.toFront();
+ }
- this.paperSlider.toBack();
- this.paperBackground.toBack();
- this.sliderTip.toFront();
- }
-
- this._Popcorn.listen("timeupdate", IriSP.wrap(this, this.sliderUpdater));
-}
+ this._Popcorn.listen("timeupdate", IriSP.wrap(this, this.sliderUpdater));
+ }
-IriSP.PolemicWidget.prototype.sliderUpdater = function() {
+ IriSP.PolemicWidget.prototype.sliderUpdater = function() {
- var time = +this._Popcorn.currentTime();
- var duration = +this._serializer.currentMedia().meta["dc:duration"];
-
- this.paperSlider.attr("width", time * (this.width / (duration / 1000)));
-
- this.sliderTip.attr("x", time * (this.width / (duration / 1000)));
-};
-
-
\ No newline at end of file
+ var time = +this._Popcorn.currentTime();
+ var duration = +this._serializer.currentMedia().meta["dc:duration"];
+
+ this.paperSlider.attr("width", time * (this.width / (duration / 1000)));
+
+ this.sliderTip.attr("x", time * (this.width / (duration / 1000)));
+ };
+});
+
\ No newline at end of file
diff -r 8f99b0df3278 -r 6008172a0592 src/js/widgets/segmentsWidget.js
--- a/src/js/widgets/segmentsWidget.js Mon Nov 14 16:12:13 2011 +0100
+++ b/src/js/widgets/segmentsWidget.js Mon Nov 14 17:19:26 2011 +0100
@@ -1,148 +1,150 @@
-IriSP.SegmentsWidget = function(Popcorn, config, Serializer) {
+define(["IriSP", "widgets", "util", "tooltipWidget"], function() {
+ IriSP.SegmentsWidget = function(Popcorn, config, Serializer) {
- var self = this;
- IriSP.Widget.call(this, Popcorn, config, Serializer);
- this.oldSearchMatches = [];
+ var self = this;
+ IriSP.Widget.call(this, Popcorn, config, Serializer);
+ this.oldSearchMatches = [];
- // event handlers
- this._Popcorn.listen("IriSP.search", function(searchString) { self.searchHandler.call(self, searchString); });
- this._Popcorn.listen("IriSP.search.closed", function() { self.searchFieldClosedHandler.call(self); });
- this._Popcorn.listen("IriSP.search.cleared", function() { self.searchFieldClearedHandler.call(self); });
-};
+ // event handlers
+ this._Popcorn.listen("IriSP.search", function(searchString) { self.searchHandler.call(self, searchString); });
+ this._Popcorn.listen("IriSP.search.closed", function() { self.searchFieldClosedHandler.call(self); });
+ this._Popcorn.listen("IriSP.search.cleared", function() { self.searchFieldClearedHandler.call(self); });
+ };
-IriSP.SegmentsWidget.prototype = new IriSP.Widget();
+ IriSP.SegmentsWidget.prototype = new IriSP.Widget();
-IriSP.SegmentsWidget.prototype.draw = function() {
+ IriSP.SegmentsWidget.prototype.draw = function() {
- var self = this;
- var annotations = this._serializer._data.annotations;
+ var self = this;
+ var annotations = this._serializer._data.annotations;
- this.selector.css("overflow", "auto"); // clear the floats - FIXME : to refactor ?
- this.selector.append(Mustache.to_html(IriSP.overlay_marker_template));
-
- this.positionMarker = this.selector.children(":first");
-
- this._Popcorn.listen("timeupdate", IriSP.wrap(this, this.positionUpdater));
-
- this.selector.after(""); // we need to do this because the segments are floated
-
- var i = 0;
- var totalWidth = this.selector.width();
- var onePxPercent = 100 / totalWidth; /* the value of a pixel, in percents */
-
- for (i = 0; i < annotations.length; i++) {
- var annotation = annotations[i];
+ this.selector.css("overflow", "auto"); // clear the floats - FIXME : to refactor ?
+ this.selector.append(Mustache.to_html(IriSP.overlay_marker_template));
+
+ this.positionMarker = this.selector.children(":first");
+
+ this._Popcorn.listen("timeupdate", IriSP.wrap(this, this.positionUpdater));
+
+ this.selector.after(""); // we need to do this because the segments are floated
+
+ var i = 0;
+ var totalWidth = this.selector.width();
+ var onePxPercent = 100 / totalWidth; /* the value of a pixel, in percents */
+
+ for (i = 0; i < annotations.length; i++) {
+ var annotation = annotations[i];
- 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);
-
- /* 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;
-
- /* on the other hand, we have to substract one pixel from the first box because it's the only
- one to have to effective 1px margins */
- if (i == 0) {
+ 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);
+
+ /* 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;
+
+ /* on the other hand, we have to substract one pixel from the first box because it's the only
+ one to have to effective 1px margins */
+ if (i == 0) {
- endPourcent -= onePxPercent;
- }
-
- var divTitle = annotation.content.title.substr(0,55);
- var color = annotation.content.color
+ endPourcent -= onePxPercent;
+ }
+
+ var divTitle = annotation.content.title.substr(0,55);
+ var color = annotation.content.color
- var annotationTemplate = Mustache.to_html(IriSP.annotation_template,
- {"divTitle" : divTitle, "id" : id, "startPourcent" : startPourcent,
- "endPourcent" : endPourcent, "hexa_color" : IriSP.DEC_HEXA_COLOR(color),
- "seekPlace" : Math.round(begin/1000)});
+ var annotationTemplate = Mustache.to_html(IriSP.annotation_template,
+ {"divTitle" : divTitle, "id" : id, "startPourcent" : startPourcent,
+ "endPourcent" : endPourcent, "hexa_color" : IriSP.DEC_HEXA_COLOR(color),
+ "seekPlace" : Math.round(begin/1000)});
- var toolTipTemplate = Mustache.to_html(IriSP.tooltip_template,
- {"title" : divTitle, "begin" : begin, "end" : end,
- "description": annotation.content.description});
+ var toolTipTemplate = Mustache.to_html(IriSP.tooltip_template,
+ {"title" : divTitle, "begin" : begin, "end" : end,
+ "description": annotation.content.description});
- this.selector.append(annotationTemplate);
+ this.selector.append(annotationTemplate);
- IriSP.jQuery("#" + id).tooltip({ effect: 'slide'});
+ IriSP.jQuery("#" + id).tooltip({ effect: 'slide'});
- IriSP.jQuery("#" + id).fadeTo(0, 0.3);
+ IriSP.jQuery("#" + id).fadeTo(0, 0.3);
- IriSP.jQuery("#" + id).mouseover(function() {
- IriSP.jQuery("#" + id).animate({opacity: 0.6}, 5);
- }).mouseout(function(){
- IriSP.jQuery("#" + id).animate({opacity: 0.3}, 5);
- });
+ IriSP.jQuery("#" + id).mouseover(function() {
+ IriSP.jQuery("#" + id).animate({opacity: 0.6}, 5);
+ }).mouseout(function(){
+ IriSP.jQuery("#" + id).animate({opacity: 0.3}, 5);
+ });
- IriSP.jQuery("#" + id).click(function(_this, annotation) {
- return function() { _this.clickHandler(annotation)};
- }(this, annotation));
- }
-};
+ IriSP.jQuery("#" + id).click(function(_this, annotation) {
+ return function() { _this.clickHandler(annotation)};
+ }(this, annotation));
+ }
+ };
-/* restores the view after a search */
-IriSP.SegmentsWidget.prototype.clear = function() {
- // reinit the fields
- for (var id in this.oldSearchMatches) {
+ /* restores the view after a search */
+ IriSP.SegmentsWidget.prototype.clear = function() {
+ // reinit the fields
+ for (var id in this.oldSearchMatches) {
- IriSP.jQuery("#"+id).dequeue();
- IriSP.jQuery("#"+id).animate({height:0}, 100);
- IriSP.jQuery("#"+id).css('border-color','lightgray');
- IriSP.jQuery("#"+id).animate({opacity:0.3}, 100);
- }
-};
+ IriSP.jQuery("#"+id).dequeue();
+ IriSP.jQuery("#"+id).animate({height:0}, 100);
+ IriSP.jQuery("#"+id).css('border-color','lightgray');
+ IriSP.jQuery("#"+id).animate({opacity:0.3}, 100);
+ }
+ };
-IriSP.SegmentsWidget.prototype.clickHandler = function(annotation) {
- var begin = Math.round((+ annotation.begin) / 1000);
- this._Popcorn.currentTime(begin);
-};
+ IriSP.SegmentsWidget.prototype.clickHandler = function(annotation) {
+ var begin = Math.round((+ annotation.begin) / 1000);
+ this._Popcorn.currentTime(begin);
+ };
-IriSP.SegmentsWidget.prototype.searchHandler = function(searchString) {
+ IriSP.SegmentsWidget.prototype.searchHandler = function(searchString) {
- if (searchString == "")
- return;
+ if (searchString == "")
+ return;
- var matches = this._serializer.searchOccurences(searchString);
+ var matches = this._serializer.searchOccurences(searchString);
- for (var id in matches) {
- var factor = matches[id] * 8;
- this.selector.find("#"+id).dequeue();
- this.selector.find("#"+id).animate({height: factor}, 200);
- this.selector.find("#"+id).css('border-color','red');
- this.selector.find("#"+id).animate({opacity:0.6}, 200);
+ for (var id in matches) {
+ var factor = matches[id] * 8;
+ this.selector.find("#"+id).dequeue();
+ this.selector.find("#"+id).animate({height: factor}, 200);
+ this.selector.find("#"+id).css('border-color','red');
+ this.selector.find("#"+id).animate({opacity:0.6}, 200);
- IriSP.jQuery("#LdtSearchInput").css('background-color','#e1ffe1');
- }
+ IriSP.jQuery("#LdtSearchInput").css('background-color','#e1ffe1');
+ }
- // clean up the blocks that were in the previous search
- // but who aren't in the current one.
- for (var id in this.oldSearchMatches) {
- if (!matches.hasOwnProperty(id)) {
- IriSP.jQuery("#"+id).dequeue();
- IriSP.jQuery("#"+id).animate({height:0}, 250);
- IriSP.jQuery("#"+id).animate({opacity:0.3}, 200);
- this.selector.find("#"+id).css('border','solid 1px #aaaaaa');
+ // clean up the blocks that were in the previous search
+ // but who aren't in the current one.
+ for (var id in this.oldSearchMatches) {
+ if (!matches.hasOwnProperty(id)) {
+ IriSP.jQuery("#"+id).dequeue();
+ IriSP.jQuery("#"+id).animate({height:0}, 250);
+ IriSP.jQuery("#"+id).animate({opacity:0.3}, 200);
+ this.selector.find("#"+id).css('border','solid 1px #aaaaaa');
+ }
}
- }
-
- this.oldSearchMatches = matches;
-};
+
+ this.oldSearchMatches = matches;
+ };
-IriSP.SegmentsWidget.prototype.searchFieldClearedHandler = function() {
- this.clear();
-};
+ IriSP.SegmentsWidget.prototype.searchFieldClearedHandler = function() {
+ this.clear();
+ };
-IriSP.SegmentsWidget.prototype.searchFieldClosedHandler = function() {
- this.clear();
-};
+ IriSP.SegmentsWidget.prototype.searchFieldClosedHandler = function() {
+ this.clear();
+ };
-IriSP.SegmentsWidget.prototype.positionUpdater = function() {
- var duration = this._serializer.currentMedia().meta["dc:duration"] / 1000;
- var time = this._Popcorn.currentTime();
- var position = ((time / duration) * 100).toFixed(2);
+ IriSP.SegmentsWidget.prototype.positionUpdater = function() {
+ var duration = this._serializer.currentMedia().meta["dc:duration"] / 1000;
+ var time = this._Popcorn.currentTime();
+ var position = ((time / duration) * 100).toFixed(2);
- this.positionMarker.css("left", position + "%");
-};
\ No newline at end of file
+ this.positionMarker.css("left", position + "%");
+ };
+});
\ No newline at end of file
diff -r 8f99b0df3278 -r 6008172a0592 src/js/widgets/sliderWidget.js
--- a/src/js/widgets/sliderWidget.js Mon Nov 14 16:12:13 2011 +0100
+++ b/src/js/widgets/sliderWidget.js Mon Nov 14 17:19:26 2011 +0100
@@ -1,52 +1,54 @@
-IriSP.SliderWidget = function(Popcorn, config, Serializer) {
- IriSP.Widget.call(this, Popcorn, config, Serializer);
-};
+define(["IriSP", "widgets", "util"], function() {
+ IriSP.SliderWidget = function(Popcorn, config, Serializer) {
+ IriSP.Widget.call(this, Popcorn, config, Serializer);
+ };
-IriSP.SliderWidget.prototype = new IriSP.Widget();
+ IriSP.SliderWidget.prototype = new IriSP.Widget();
-IriSP.SliderWidget.prototype.draw = function() {
- var self = this;
-
- this.selector.append("");
- this.sliderBackground = this.selector.children(".sliderBackground");
-
- this.selector.append("");
- this.sliderForeground = this.selector.children(".sliderForeground");
-
- this.selector.append(Mustache.to_html(IriSP.overlay_marker_template));
- this.positionMarker = this.selector.children(".positionMarker");
-
- this.sliderBackground.click(function(event) { self.clickHandler.call(self, event); });
-
- this._Popcorn.listen("timeupdate", IriSP.wrap(this, this.sliderUpdater));
-};
+ IriSP.SliderWidget.prototype.draw = function() {
+ var self = this;
+
+ this.selector.append("");
+ this.sliderBackground = this.selector.children(".sliderBackground");
+
+ this.selector.append("");
+ this.sliderForeground = this.selector.children(".sliderForeground");
+
+ this.selector.append(Mustache.to_html(IriSP.overlay_marker_template));
+ this.positionMarker = this.selector.children(".positionMarker");
+
+ this.sliderBackground.click(function(event) { self.clickHandler.call(self, event); });
+
+ this._Popcorn.listen("timeupdate", IriSP.wrap(this, this.sliderUpdater));
+ };
-/* updates the slider as time passes */
-IriSP.SliderWidget.prototype.sliderUpdater = function() {
- var time = this._Popcorn.currentTime();
-
- var duration = this._serializer.currentMedia().meta["dc:duration"] / 1000;
- var percent = ((time / duration) * 100).toFixed(2);
- this.sliderForeground.css("width", percent + "%");
- this.positionMarker.css("left", percent + "%");
-
-};
+ /* updates the slider as time passes */
+ IriSP.SliderWidget.prototype.sliderUpdater = function() {
+ var time = this._Popcorn.currentTime();
+
+ var duration = this._serializer.currentMedia().meta["dc:duration"] / 1000;
+ var percent = ((time / duration) * 100).toFixed(2);
+ this.sliderForeground.css("width", percent + "%");
+ this.positionMarker.css("left", percent + "%");
+
+ };
-IriSP.SliderWidget.prototype.clickHandler = function(event) {
- /* this piece of code is a little bit convoluted - here's how it works :
- we want to handle clicks on the progress bar and convert those to seeks in the media.
- However, jquery only gives us a global position, and we want a number of pixels relative
- to our container div, so we get the parent position, and compute an offset to this position,
- and finally compute the progress ratio in the media.
- Finally we multiply this ratio with the duration to get the correct time
- */
-
- var parentOffset = this.sliderBackground.parent().offset();
- var width = this.sliderBackground.width();
- var relX = event.pageX - parentOffset.left;
-
- var duration = this._serializer.currentMedia().meta["dc:duration"] / 1000;
- var newTime = ((relX / width) * duration).toFixed(2);
-
- this._Popcorn.currentTime(newTime);
-};
\ No newline at end of file
+ IriSP.SliderWidget.prototype.clickHandler = function(event) {
+ /* this piece of code is a little bit convoluted - here's how it works :
+ we want to handle clicks on the progress bar and convert those to seeks in the media.
+ However, jquery only gives us a global position, and we want a number of pixels relative
+ to our container div, so we get the parent position, and compute an offset to this position,
+ and finally compute the progress ratio in the media.
+ Finally we multiply this ratio with the duration to get the correct time
+ */
+
+ var parentOffset = this.sliderBackground.parent().offset();
+ var width = this.sliderBackground.width();
+ var relX = event.pageX - parentOffset.left;
+
+ var duration = this._serializer.currentMedia().meta["dc:duration"] / 1000;
+ var newTime = ((relX / width) * duration).toFixed(2);
+
+ this._Popcorn.currentTime(newTime);
+ };
+});
\ No newline at end of file
diff -r 8f99b0df3278 -r 6008172a0592 src/js/widgets/tooltipWidget.js
--- a/src/js/widgets/tooltipWidget.js Mon Nov 14 16:12:13 2011 +0100
+++ b/src/js/widgets/tooltipWidget.js Mon Nov 14 17:19:26 2011 +0100
@@ -1,28 +1,30 @@
/* this widget displays a small tooltip */
-IriSP.TooltipWidget = function(Popcorn, config, Serializer) {
- IriSP.Widget.call(this, Popcorn, config, Serializer);
-};
+define(["IriSP", "widgets", "util"], function() {
+ IriSP.TooltipWidget = function(Popcorn, config, Serializer) {
+ IriSP.Widget.call(this, Popcorn, config, Serializer);
+ };
-IriSP.TooltipWidget.prototype = new IriSP.Widget();
+ IriSP.TooltipWidget.prototype = new IriSP.Widget();
-IriSP.TooltipWidget.prototype.draw = function() {
- var templ = Mustache.to_html(IriSP.tooltipWidget_template);
+ IriSP.TooltipWidget.prototype.draw = function() {
+ var templ = Mustache.to_html(IriSP.tooltipWidget_template);
+
+ this.selector.append(templ);
+ this.hide();
- this.selector.append(templ);
- this.hide();
-
-};
+ };
-IriSP.TooltipWidget.prototype.show = function(text, color, x, y) {
- if (this.selector.find(".tiptext").text() == text)
- return;
-
- this.selector.find(".tipcolor").css("background-color", color);
- this.selector.find(".tiptext").text(text);
- this.selector.find(".tip").css("left", x).css("top", y);
-};
+ IriSP.TooltipWidget.prototype.show = function(text, color, x, y) {
+ if (this.selector.find(".tiptext").text() == text)
+ return;
+
+ this.selector.find(".tipcolor").css("background-color", color);
+ this.selector.find(".tiptext").text(text);
+ this.selector.find(".tip").css("left", x).css("top", y);
+ };
-IriSP.TooltipWidget.prototype.hide = function() {
- this.selector.find(".tip").css("left", -10000).css("top", -100000);
-};
\ No newline at end of file
+ IriSP.TooltipWidget.prototype.hide = function() {
+ this.selector.find(".tip").css("left", -10000).css("top", -100000);
+ };
+});
\ No newline at end of file