Mercurial Mercurial > bubbletv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Corrected localStorage draft
authorveltr
Fri, 24 Feb 2012 12:03:33 +0100
changeset 40 c0205b71e013
parent 39 c9378e7e853a
child 41 91adc8bf6205
Corrected localStorage
client/css/controlpanel.css file | annotate | diff | comparison | revisions
client/css/main.css file | annotate | diff | comparison | revisions
client/js/main.js file | annotate | diff | comparison | revisions
client/js/tweetvote-anim.js file | annotate | diff | comparison | revisions 
--- a/client/css/controlpanel.css	Fri Feb 24 11:22:59 2012 +0100
+++ b/client/css/controlpanel.css	Fri Feb 24 12:03:33 2012 +0100
@@ -52,6 +52,9 @@
 .btv-cp-tweet-from {
     font-weight: bold;
 }
+.btv-cp-tweet-image, .btv-cp-tweet-from-name {
+    display: none;
+}
 
 .btv-cp-tweet-remove {
     background-position: -30px 0;
--- a/client/css/main.css	Fri Feb 24 11:22:59 2012 +0100
+++ b/client/css/main.css	Fri Feb 24 12:03:33 2012 +0100
@@ -71,6 +71,10 @@
     width: 350px; padding: 10px; margin: -30px 0 0 -380px; border-right: 5px solid;
 }
 
+.btv-tooltip-date {
+    display: none;
+}
+
 .btv-tooltip-arrow {
     position: absolute; width: 35px; height: 50px; top: 30px; left: 370px; background: url('../img/tooltip-arrow.png');
 }
--- a/client/js/main.js	Fri Feb 24 11:22:59 2012 +0100
+++ b/client/js/main.js	Fri Feb 24 12:03:33 2012 +0100
@@ -30,15 +30,18 @@
     }
     $('#btv-cp-liste-tweets-tout').html(
         _filtered.reverse().slice(0,20).map(function(_t) {
-            return '<li onclick="addTweetToSelection(\''
-                + _t.id_str
-                + '\'); return false;"><a title="Ajouter à la sélection" href="#"><span class="btv-cp-tweet-date">'
+            return '<li onclick="addTweetToSelection(this); return false;"><a title="Ajouter à la sélection" href="#">'
+                + '<span class="btv-cp-tweet-date tweet-data-date">'
                 + _t.created_at.match(/\d+:\d+:\d+/)[0]
-                + '</span> <span class="btv-cp-tweet-from">'
+                + '</span> <span class="btv-cp-tweet-from tweet-data-from">'
                 + ( _reFilter ? ('@' + _t.from_user).replace(_reFilter, '<span class="btv-cp-highlight">$1</span>') : ('@' + _t.from_user) )
-                + '</span> <span class="btv-cp-tweet-text">'
+                + '</span> <span class="btv-cp-tweet-from-name tweet-data-from-name">'
+                + _t.from_user_name
+                + '</span> <span class="btv-cp-tweet-text tweet-data-text">'
                 + ( _reFilter ? _t.text.replace(_reFilter, '<span class="btv-cp-highlight">$1</span>') : _t.text )
-                + '</span><div class="btv-cp-tweet-button btv-cp-tweet-add"></div></a></li>'
+                + '</span><img class="btv-cp-tweet-image tweet-data-image" src="'
+                + _t.profile_image_url
+                + '" /><div class="btv-cp-tweet-button btv-cp-tweet-add"></div></a></li>'
         }).join('')
     );
 }
@@ -49,50 +52,48 @@
     }
 }
 
-function addTweetToSelection(tweetId) {
-    var _t = myTweetSource.tweetById(tweetId);
-    if (_t) {
-        $("#btv-cp-liste-tweets-selection").prepend(
-            '<li><a title="Afficher sur l\'écran" href="#" onclick="showTweetOnScreen(\''
-            + _t.id_str
-            + '\'); return false;"><span class="btv-cp-tweet-date">'
-            + _t.created_at.match(/\d+:\d+:\d+/)[0]
-            + '</span> <span class="btv-cp-tweet-from">@'
-            + _t.from_user
-            + '</span> <span class="btv-cp-tweet-text">'
-            + _t.text
-            + '</span><div class="btv-cp-tweet-button btv-cp-tweet-show"></div></a>'
-            + '<a title="Supprimer de cette liste" href="#" onclick="$(this).parent().detach(); saveTweetSelection(); return false;"><div class="btv-cp-tweet-button btv-cp-tweet-remove"></div></a></li>'
-        );
-        saveTweetSelection();
-    }
+function addTweetToSelection(_e) {
+    $("#btv-cp-liste-tweets-selection").prepend(
+        '<li><a title="Afficher sur l\'écran" href="#" onclick="showTweetOnScreen(this); return false;">'
+        + '<span class="btv-cp-tweet-date tweet-data-date">'
+        + $(_e).find(".tweet-data-date").text()
+        + '</span>  <span class="btv-cp-tweet-from tweet-data-from">'
+        + $(_e).find(".tweet-data-from").text()
+        + '</span>  <span class="btv-cp-tweet-from-name tweet-data-from-name">'
+        + $(_e).find(".tweet-data-from-name").text()
+        + '</span> <span class="btv-cp-tweet-text tweet-data-text">'
+        + $(_e).find(".tweet-data-text").text()
+        + '</span><img class="btv-cp-tweet-image tweet-data-image" src="'
+        + $(_e).find(".tweet-data-image").attr("src")
+        + '" /><div class="btv-cp-tweet-button btv-cp-tweet-show"></div></a>'
+        + '<a title="Supprimer de cette liste" href="#" onclick="$(this).parent().detach(); saveTweetSelection(); return false;"><div class="btv-cp-tweet-button btv-cp-tweet-remove"></div></a></li>'
+    );
+    saveTweetSelection();
 }
 
-function showTweetOnScreen(tweetId) {
-    var _t = myTweetSource.tweetById(tweetId);
-    console.log(_t);
-    if (_t) {
-        $("#btv-bigtweet").html('<img class="btv-bigtweet-image" src="'
-        + _t.profile_image_url
-        + '" /><p class="btv-bigtweet-screen-name">'
-        + _t.from_user
-        + '</p><p class="btv-bigtweet-name">'
-        + _t.from_user_name
-        +'</p><p class="btv-bigtweet-text">'
-        + _t.text
-        +'</p>').show();
-        $(".btv-cp-hide-tweets").show();
-    }
+function showTweetOnScreen(_e) {
+    $("#btv-bigtweet").html('<img class="btv-bigtweet-image" src="'
+    + $(_e).find(".tweet-data-image").attr("src")
+    + '" /><p class="btv-bigtweet-screen-name">'
+    + $(_e).find(".tweet-data-from").text()
+    + '</p><p class="btv-bigtweet-name">'
+    + $(_e).find(".tweet-data-from-name").text()
+    +'</p><p class="btv-bigtweet-text">'
+    + $(_e).find(".tweet-data-text").text()
+    +'</p>').show();
+    $(".btv-cp-hide-tweets").show();
 }
 
 function showTooltip(_t, _x, _y) {
-    $("#btv-tooltip").html('<img class="btv-tooltip-image" src="'
+    $("#btv-tooltip").html('<img class="btv-tooltip-image tweet-data-image" src="'
         + _t.profile_image_url
-        + '" /><p class="btv-tooltip-name"><span>'
+        + '" /><p class="btv-tooltip-name"><span class="tweet-data-from">'
         + _t.from_user
-        + '</span> (<span>'
+        + '</span> (<span class="tweet-data-from-name">'
         + _t.from_user_name
-        +'</span>)</p><p>'
+        +'</span>)<span class="btv-tooltip-date tweet-data-date">'
+        + _t.created_at.match(/\d+:\d+:\d+/)[0]
+        + '</span></p><p class="tweet-data-text">'
         + _t.text
         +'</p><div class="btv-tooltip-arrow"></div>').show().css({
             "left": _x + "px",
--- a/client/js/tweetvote-anim.js	Fri Feb 24 11:22:59 2012 +0100
+++ b/client/js/tweetvote-anim.js	Fri Feb 24 12:03:33 2012 +0100
@@ -304,7 +304,7 @@
 	    });
 	    showTooltip(t, _of.left, _of.top);  
 	}).mouseout(hideTooltip).click(function() {
-        addTweetToSelection(t.id_str);
+        addTweetToSelection($("#btv-tooltip"));
 	    $(this).fadeTo(100,.25, function() {
 	        $(this).fadeTo(100,1);
 	        showControlPanel();
bubbletv