Mercurial Mercurial > tweet_live / 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.
Bugfixes V02.23
authorRaphael Velt <raph.velt@gmail.com>
Mon, 15 Apr 2013 13:40:50 +0200
changeset 849 973a136cfbd0
parent 848 eed4cdee4ed0
child 850 9a3506467341
Bugfixes
web/callback.php file | annotate | diff | comparison | revisions
web/hanna-arendt/script.js file | annotate | diff | comparison | revisions
web/res/js/live-polemic.js file | annotate | diff | comparison | revisions 
--- a/web/callback.php	Mon Apr 15 13:24:53 2013 +0200
+++ b/web/callback.php	Mon Apr 15 13:40:50 2013 +0200
@@ -32,16 +32,10 @@
     /**
      * With Access Token in hand, let's try accessing the client again
      */
-     echo "Would redirect to " . ( isset($_SESSION['TWITTER_REDIRECT_URL']) ? $_SESSION['TWITTER_REDIRECT_URL'] : ( URL_ROOT . "$rep/client.php" ) );
-    //header('Location: ' . ( isset($_SESSION['TWITTER_REDIRECT_URL']) ? $_SESSION['TWITTER_REDIRECT_URL'] : ( URL_ROOT . "$rep/client.php" ) ) );
+    header('Location: ' . ( isset($_SESSION['TWITTER_REDIRECT_URL']) ? $_SESSION['TWITTER_REDIRECT_URL'] : ( URL_ROOT . "$rep/client.php" ) ) );
 } else {
     /**
      * Mistaken request? Some malfeasant trying something?
      */
-    echo "<h2>$_GET</h2><pre>";
-	print_r($_GET);
-	echo "</pre><h2>$_SESSION</h2><pre>";
-	print_r($_SESSION);
-	echo "</pre>";
     exit('Invalid callback request. Oops. Sorry.');
 }
--- a/web/hanna-arendt/script.js	Mon Apr 15 13:24:53 2013 +0200
+++ b/web/hanna-arendt/script.js	Mon Apr 15 13:40:50 2013 +0200
@@ -335,6 +335,9 @@
 }
 
 function flattenDateStruct(slices, target_level) {
+	if (!slices || !slices.length) {
+		return [];
+	}
     var current_level = slices[0].level,
         result = [];
     if (current_level < target_level) {
@@ -358,6 +361,9 @@
 
 function trimFDS() {
     var slices = flattenDateStruct(twCx.timeline, twCx.timeLevel);
+	if (!slices || !slices.length) {
+		return [];
+	}
     while (slices[0].tweets.length == 0) {
         slices.splice(0,1);
     }
@@ -506,7 +512,7 @@
 }
 
 function tlIdFromPos(x, y, outside) {
-    if (!twCx.tlOnDisplay) {
+    if (!twCx.tlOnDisplay || !twCx.tlOnDisplay.length) {
         return;
     }
     var ligne = Math.min( twCx.tlOnDisplay.length - 1, Math.max( 0, Math.floor(( twCx.tlHeight - y ) / twCx.scaleY) ) ),
@@ -817,6 +823,9 @@
     }
     
     twCx.tlOnDisplay = trimFDS();
+    if (!twCx.tlOnDisplay || !twCx.tlOnDisplay.length) {
+    	return;
+    }
     twCx.scaleY = twCx.tlHeight / twCx.tlOnDisplay.length;
     var maxTweets = 0,
         startTl = 0,
--- a/web/res/js/live-polemic.js	Mon Apr 15 13:24:53 2013 +0200
+++ b/web/res/js/live-polemic.js	Mon Apr 15 13:40:50 2013 +0200
@@ -353,6 +353,9 @@
 }
 
 function flattenDateStruct(slices, target_level) {
+	if (!slices || !slices.length) {
+		return [];
+	}
     var current_level = slices[0].level,
         result = [];
     if (current_level < target_level) {
@@ -375,6 +378,9 @@
 }
 
 function trimFDS() {
+	if (!slices || !slices.length) {
+		return [];
+	}
     var slices = flattenDateStruct(twCx.timeline, twCx.timeLevel);
     while (slices[0].tweets.length == 0) {
         slices.splice(0,1);
@@ -524,7 +530,7 @@
 }
 
 function tlIdFromPos(x, y, outside) {
-    if (!twCx.tlOnDisplay) {
+    if (!twCx.tlOnDisplay || !twCx.tlOnDisplay.length) {
         return;
     }
     var ligne = Math.min( twCx.tlOnDisplay.length - 1, Math.max( 0, Math.floor(( twCx.tlHeight - y ) / twCx.scaleY) ) ),
@@ -835,6 +841,9 @@
     }
     
     twCx.tlOnDisplay = trimFDS();
+    if (!twCx.tlOnDisplay || !twCx.tlOnDisplay.length) {
+    	return;
+    }
     twCx.scaleY = twCx.tlHeight / twCx.tlOnDisplay.length;
     var maxTweets = 0,
         startTl = 0,
tweet_live