fixes a display bug because mustache escapes html by default. popcorn-port
authorhamidouk
Mon, 21 Nov 2011 16:20:55 +0100
branchpopcorn-port
changeset 298 eccdc619ede3
parent 297 ed4a459c9290
child 299 d2005f747d5a
fixes a display bug because mustache escapes html by default.
src/js/widgets/tweetsWidget.js
src/templates/rich_tweet.html
unittests/tests/widgets/tweetsWidget.js
--- a/src/js/widgets/tweetsWidget.js	Mon Nov 21 16:20:16 2011 +0100
+++ b/src/js/widgets/tweetsWidget.js	Mon Nov 21 16:20:55 2011 +0100
@@ -30,7 +30,6 @@
                                        {src : img, creator: creator});
             
       title = Mustache.to_html(IriSP.rich_tweet_template, {contents : title, date : tweetContents.created_at});
-      console.log(title);
     }
 
     this.selector.find(".Ldt-tweetContents").html(title);
--- a/src/templates/rich_tweet.html	Mon Nov 21 16:20:16 2011 +0100
+++ b/src/templates/rich_tweet.html	Mon Nov 21 16:20:55 2011 +0100
@@ -3,5 +3,5 @@
     dc:source.content)
 }}
 
-<div class='Ldt-tweet_tweetContents'>{{ contents }}</div>
+<div class='Ldt-tweet_tweetContents'>{{{ contents }}}</div>
 <div class='Ldt-tweet_date'>{{ date }}</div>
\ No newline at end of file
--- a/unittests/tests/widgets/tweetsWidget.js	Mon Nov 21 16:20:16 2011 +0100
+++ b/unittests/tests/widgets/tweetsWidget.js	Mon Nov 21 16:20:55 2011 +0100
@@ -36,13 +36,16 @@
     
     var widget = new IriSP.TweetsWidget(this.Popcorn, this.config, this.ser);    
     widget.draw();
-    var annotation = {content: {"title": "title", "description": "description", "keywords": "keywords", "img": {"src" : "http://yop.com"}}};
+    var annotation = {content: 
+                        {"title": "title", "description": "description", "keywords": "keywords", "img": {"src" : "http://yop.com"}},
+                      meta: {"dc:source" : {}}
+                     };
     widget.displayTweet(annotation);
     
     equal(widget.selector.find(".Ldt-tweetContents").text(), "title", "title set correctly");    
     equal(widget.selector.find(".Ldt-tweetAvatar").children().attr("src"), "http://yop.com", "user avatar set correctly");
     
-    var annotation2 = {content: {"title": "title", "description": "description", "keywords": "keywords", "img" : {}}};
+    var annotation2 = {content: {"title": "title", "description": "description", "keywords": "keywords", "img" : {}}, meta: {"dc:source" : {}}};
     widget.displayTweet(annotation2);
     equal(widget.selector.find(".Ldt-tweetAvatar").children().attr("src"), 
                                IriSP.widgetsDefaults.TweetsWidget.default_profile_picture, "default avatar set correctly");