Merge with upstream.
--- a/src/js/widgets/tagCloudWidget.js Fri Jan 27 17:27:13 2012 +0100
+++ b/src/js/widgets/tagCloudWidget.js Fri Jan 27 17:27:48 2012 +0100
@@ -69,7 +69,7 @@
.html(_html);
this.selector.find("li").click(function() {
var _txt = this.textContent.replace(/(^[\s]+|[\s]+$)/g,'');
- _this._Popcorn.trigger("IriSP.search", _txt);
+ _this._Popcorn.trigger("IriSP.search.triggeredSearch", _txt);
});
this._Popcorn.listen("IriSP.search", IriSP.wrap(this, function(searchString) {
var _rgxp = new RegExp("(" + searchString.replace(/(\W)/g,'\\$1') + ")","gi");
@@ -79,8 +79,8 @@
: _e.textContent;
});
}));
- this._Popcorn.listen("IriSP.search.closed", IriSP.wrap(this, this.searchFieldClosedHandler));
- this._Popcorn.listen("IriSP.search.cleared", IriSP.wrap(this, this.searchFieldClearedHandler));
+ this._Popcorn.listen("IriSP.search.closed", IriSP.wrap(this, this.endsearch));
+ this._Popcorn.listen("IriSP.search.cleared", IriSP.wrap(this, this.endsearch));
}
IriSP.TagCloudWidget.prototype.endsearch = function() {
--- a/test/integration/polemic.htm Fri Jan 27 17:27:13 2012 +0100
+++ b/test/integration/polemic.htm Fri Jan 27 17:27:48 2012 +0100
@@ -48,21 +48,6 @@
}
}],
},
- {
- type: "StackGraphWidget",
- metadata: {
- format:'cinelab',
- src:file,
- type:'json'
- },requires: [{
- type: "TooltipWidget",
- width: 180,
- heigh: 160,
- metadata : {
- type:'empty'
- }
- }]
- },
{type: "SparklineWidget",
width: 640, /* required for this widget */
height: 50,
@@ -71,6 +56,12 @@
src:file,
type:'json'}
},
+ {type: "TagCloudWidget",
+ metadata:{
+ format:'cinelab',
+ src:file,
+ type:'json'}
+ },
{type: "SliderWidget",
metadata:{
format:'cinelab',