From ba6b4dd85460137515d41fd22beb8cdae202bced Mon Sep 17 00:00:00 2001 From: Orbweaver Date: Sun, 8 Feb 2015 19:11:58 -0500 Subject: [PATCH 1/5] favorites draft --- index.php | 18 ++++++++++++++---- main.js | 27 ++++++++++++++++++++++++++- style.css | 6 +++++- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/index.php b/index.php index cf62902..0cca650 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,6 @@ @@ -66,15 +67,16 @@
-
+
favorites
options
about
-
-
+
+
+
☆
@@ -95,6 +97,14 @@
+ ") + $("#favorites-cont").append("
"+favorites[i]+"
"); + if(favorites[i]==sub){ + favorite = true; + $("#favorite-toggle").empty(); + $("#favorite-toggle").append("★"); + } } } if(readCookie("showLogo") == "0"){ @@ -279,13 +290,25 @@ function ClearRightSide() // Clear all stories function getItems(sub, sort) // Get stories { $("#input-sub").val(""); + + var f = readCookie("favorites").split(","); + for(var i=0;i Date: Mon, 9 Feb 2015 02:01:41 -0500 Subject: [PATCH 3/5] favorites draft 3 --- index.php | 2 +- main.js | 28 ++++++++++++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/index.php b/index.php index 0f89b0f..80d6769 100644 --- a/index.php +++ b/index.php @@ -74,7 +74,7 @@
--> -
+
favorites
options
about
diff --git a/main.js b/main.js index 7eb7996..48fc470 100644 --- a/main.js +++ b/main.js @@ -1,5 +1,6 @@ var ResultLimit = 40; var favorite = false; +var sub; $(function() { // Global Variables @@ -170,7 +171,9 @@ $(document).on("click", "#favorites-button", function(){ $('#favorites').show(); }); $(document).on("click", "#favorite-toggle", function(){ + console.log(favorite); if(!favorite){ + console.log(sub); var f = readCookie("favorites"); createCookie("favorites", f+","+sub); $("#favorite-toggle").empty(); @@ -181,7 +184,7 @@ $(document).on("click", "#favorite-toggle", function(){ if(f!=""&&f!=null) f = f.replace((","+sub), ""); else - f=""; + f= ""; createCookie("favorites", f); $("#favorite-toggle").empty(); $("#favorite-toggle").append("☆"); @@ -308,15 +311,20 @@ function ClearRightSide() // Clear all stories function getItems(sub, sort) // Get stories { $("#input-sub").val(""); - var f = readCookie("favorites").split(","); - for(var i=0;i Date: Mon, 9 Feb 2015 11:13:44 -0500 Subject: [PATCH 4/5] Favorites added --- main.js | 16 ++++++++++++++-- style.css | 11 ++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/main.js b/main.js index 1480591..87499a0 100644 --- a/main.js +++ b/main.js @@ -161,6 +161,14 @@ $(document).on("keyup", "#input-title", function() // Change page title } }); +$(document).on("click", ".favorite", function() +{ + sub = $(this)[0].innerHTML; + ClearLeftSide(); + window.location.hash = "#"+sub; + getItems(sub, sort); +}); + $(document).on("click", "#showimage", function() // Show story image { $('#storyimage').toggle(); @@ -178,6 +186,7 @@ $(document).on("click", "#favorite-toggle", function(){ createCookie("favorites", f+","+sub); $("#favorite-toggle").empty(); $("#favorite-toggle").append("★"); + $("#favorites-cont").append("
"+sub+"
"); favorite = true; }else{ var f = readCookie("favorites"); @@ -188,6 +197,7 @@ $(document).on("click", "#favorite-toggle", function(){ createCookie("favorites", f); $("#favorite-toggle").empty(); $("#favorite-toggle").append("☆"); + $("#favorites-cont").find("div").remove(":contains('"+sub+"')"); favorite = false; } }); @@ -229,11 +239,12 @@ $(window).resize(function(){ function init() { var f = readCookie("favorites"); + console.log(sub); if(f!=""&&f!=null){ var favorites = f.split(","); - for(var i=0;i"+favorites[i]+"
"); - if(favorites[i]==sub){ + if(favorites[i]==sub){ favorite = true; $("#favorite-toggle").empty(); $("#favorite-toggle").append("★"); @@ -320,6 +331,7 @@ function getItems(sub, sort) // Get stories favorite = true; $("#favorite-toggle").empty(); $("#favorite-toggle").append("★"); + break; }else{ favorite = false; $("#favorite-toggle").empty(); diff --git a/style.css b/style.css index 8c8b4fc..a70e843 100644 --- a/style.css +++ b/style.css @@ -253,7 +253,7 @@ p overflow: scroll; } -.result { +.result, .favorite { width: 100%; font-size: 14px; padding: 8px; @@ -261,10 +261,15 @@ p cursor: pointer; color: #428bca; } -.result:hover { +.result:hover, .favorite:hover { background-color: rgba(66, 139, 202, 0.04); } -#favorite-icon { +#favorite-icon +{ width: 50%; +} +#favorite-toggle +{ + cursor: pointer; } \ No newline at end of file From 9e4cc822f3566d1b70f899be6a3f5221c0250091 Mon Sep 17 00:00:00 2001 From: Orbweaver Date: Mon, 9 Feb 2015 11:18:33 -0500 Subject: [PATCH 5/5] fixed console.logs --- main.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/main.js b/main.js index 87499a0..a468db6 100644 --- a/main.js +++ b/main.js @@ -179,9 +179,7 @@ $(document).on("click", "#favorites-button", function(){ $('#favorites').show(); }); $(document).on("click", "#favorite-toggle", function(){ - console.log(favorite); if(!favorite){ - console.log(sub); var f = readCookie("favorites"); createCookie("favorites", f+","+sub); $("#favorite-toggle").empty(); @@ -239,7 +237,6 @@ $(window).resize(function(){ function init() { var f = readCookie("favorites"); - console.log(sub); if(f!=""&&f!=null){ var favorites = f.split(","); for(var i=1;i