--- a/src/js/widgets/tweetsWidget.js	Fri Nov 18 12:12:28 2011 +0100
+++ b/src/js/widgets/tweetsWidget.js	Fri Nov 18 14:33:24 2011 +0100
@@ -2,33 +2,16 @@
 
 IriSP.TweetsWidget = function(Popcorn, config, Serializer) {
   IriSP.Widget.call(this, Popcorn, config, Serializer);
-  
-  /* this is a bit complex : we use a list to queue the tweets to display, for
-     two reasons :
-     - first, We want the pane to retract when there's no tweets to see - it's doable
-       but it would lead for race conditions - imagine that the user clicks on a tweet
-       and wants it displayed, it would display in an empty pane
-     - second case, the pane displays a tweet and the user clicks before that the tweet
-       has finished displaying - he wants his tweet to be displayed now, not after the
-       previous tweet has finished.
-       
-     So, we queue every tweet in a message queue, which gets consumed at every call of
-     displayTweet.
-  */
-  this._messageQueue = [];
-  
-  /* a variable for an edge case : when the user has clicked on a tweet and clicks on another
-     one before that the first has been cleared. In this case, the second one will be displayed
-     but cleared before its time.
-  */
-  this._tweetClearedBeforeEnd = false;
+ 
+  this._isDisplayingTweet = false;
+  this._ignoreClear = false;
 };
 
 
 IriSP.TweetsWidget.prototype = new IriSP.Widget();
 
 
-IriSP.TweetsWidget.prototype.displayTweet = function(annotation) {
+IriSP.TweetsWidget.prototype.drawTweet = function(annotation) {
     
     var title = annotation.content.title;
     var img = annotation.content.img.src;
@@ -44,36 +27,31 @@
     this.selector.show(50);
 };
 
-IriSP.TweetsWidget.prototype.pushQueue = function(annotation) {
-  this._messageQueue.push(annotation);
+IriSP.TweetsWidget.prototype.displayTweet = function(annotation) {
+  if (this._isDisplayingTweet === false) {
+    this._isDisplayingTweet = true;
+  } else { /* we're already displaying a tweet */
+    this._ignoreClear = true;
+  }
   
-  // we're pushing in the queue before another tweet has been
-  // displayed
-  if (this._messageQueue.length != 0)
-    this._tweetClearedBeforeEnd = true;
-    
-  var annotation = this._messageQueue[0];
-  
-  this.displayTweet(annotation);
+  this.drawTweet(annotation);
 
-  var time = this._Popcorn.currentTime();
-  this._Popcorn = this._Popcorn.code({ start : time + 0.1, end: time + 10, 
-                                       onEnd: IriSP.wrap(this, this.clearQueue)});
-
+  var time = this._Popcorn.currentTime();  
+  // this._Popcorn.exec(time + 10, IriSP.wrap(this, this.clearPanel)); 
+  window.setTimeout(IriSP.wrap(this, this.clearPanel), 10000);
 };
 
-/* this does essentially the same job than handleQueue, except that it's only
-   called by handleQueue to cleanup after a tweet. */
-IriSP.TweetsWidget.prototype.clearQueue = function() {  
-  var annotation = this._messageQueue.shift();
-  
-  if( this._tweetClearedBeforeEnd === true) {  
-    this._tweetClearedBeforeEnd;
+
+IriSP.TweetsWidget.prototype.clearPanel = function() {
+  debugger;
+  if (this._ignoreClear === true) {
+    this._ignoreClear = false;
     return;
-  }
-  
-  if (this._messageQueue === []) {
+  } else {
+    /* clear the display */
     this.closePanel();
+    this._isDisplayingTweet = false;    
+    this._ignoreClear = false;    
   }
 };
 
@@ -108,7 +86,6 @@
       /* we haven't found it */
       return;
   
-  this.pushQueue(annotation);
-    
+  this.displayTweet(annotation);
   return;
 };
\ No newline at end of file