From b7dd72f3a33cb18c6c9035f4db25a35480577915 Mon Sep 17 00:00:00 2001 From: Renter Date: Sat, 14 Mar 2015 17:02:36 -0400 Subject: [PATCH 1/7] fixed coursewares --- .../js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js index 236c80b05a..7f3cad5eb8 100644 --- a/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js +++ b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js @@ -22,8 +22,12 @@ var editor = myCodeMirror; // Hijack tab key to insert two spaces instead editor.setOption("extraKeys", { Tab: function(cm) { - var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); - cm.replaceSelection(spaces); + if (cm.somethingSelected()){ + cm.indentSelection("add"); + } else { + var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); + cm.replaceSelection(spaces); + } }, "Ctrl-Enter": function() { return false; From c9970c17253477ac1a5cd5f63afd6260e77f0a76 Mon Sep 17 00:00:00 2001 From: MrRenter Date: Tue, 17 Mar 2015 02:06:58 -0400 Subject: [PATCH 2/7] Hide upvote arrow on news page if already upvoted. Make it disappear on upvote --- controllers/story.js | 14 ++++++++++++-- public/js/main.js | 3 ++- views/stories/show.jade | 6 ++++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/controllers/story.js b/controllers/story.js index fea8f00a42..97f31d16cd 100644 --- a/controllers/story.js +++ b/controllers/story.js @@ -137,7 +137,16 @@ exports.returnIndividualStory = function(req, res, next) { return res.redirect('../stories/' + dashedNameFull); } - res.render('stories/index', { + + var votedObj = story.upVotes.filter(function(a){ + return a['upVotedByUsername'] === req.user['profile']['username']; + }) + var userVoted = false; + if (votedObj.length > 0){ + userVoted = true; + } + + res.render('stories/index', { title: story.headline, link: story.link, author: story.author, @@ -150,7 +159,8 @@ exports.returnIndividualStory = function(req, res, next) { timeAgo: moment(story.timePosted).fromNow(), image: story.image, page: 'show', - storyMetaDescription: story.metaDescription + storyMetaDescription: story.metaDescription, + hasUserVoted: userVoted }); }); }; diff --git a/public/js/main.js b/public/js/main.js index 8170c1c297..5979fd88c6 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -120,7 +120,8 @@ $(document).ready(function() { }); var upvoteHandler = function () { - var _id = storyId; + $(".ion-arrow-up-b").hide(); + var _id = storyId; $('#upvote').unbind('click'); var alreadyUpvoted = false; for (var i = 0; i < upVotes.length; i++) { diff --git a/views/stories/show.jade b/views/stories/show.jade index 2d02ff0077..848f5cc5ac 100644 --- a/views/stories/show.jade +++ b/views/stories/show.jade @@ -6,6 +6,7 @@ var upVotes = !{JSON.stringify(upVotes)}; var user = !{JSON.stringify(user)}; var image = !{JSON.stringify(image)}; + var hasUserVoted = !{JSON.stringify(hasUserVoted)}; .spacer h3.row.col-xs-12 @@ -13,8 +14,9 @@ .col-xs-3.col-sm-1.text-center .row.negative-5 .col-xs-12.big-ion-up-arrow - a#upvote - i.ion-arrow-up-b + if !hasUserVoted + a#upvote + i.ion-arrow-up-b h3.story-up-votes span#storyRank= rank .col-xs-2.col-sm-1 From 6a2209b9b428e4dae41454be7ea8e9a657a54636 Mon Sep 17 00:00:00 2001 From: MrRenter Date: Tue, 17 Mar 2015 03:07:07 -0400 Subject: [PATCH 3/7] god dammit already --- .../js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js index 7f3cad5eb8..e033db5766 100644 --- a/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js +++ b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js @@ -22,12 +22,8 @@ var editor = myCodeMirror; // Hijack tab key to insert two spaces instead editor.setOption("extraKeys", { Tab: function(cm) { - if (cm.somethingSelected()){ - cm.indentSelection("add"); - } else { - var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); - cm.replaceSelection(spaces); - } + var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); + cm.replaceSelection(spaces); }, "Ctrl-Enter": function() { return false; From 9a5c7a0ce6e4f8f2cd0b1f97f424cde5660f9170 Mon Sep 17 00:00:00 2001 From: MrRenter Date: Tue, 17 Mar 2015 03:09:34 -0400 Subject: [PATCH 4/7] dammit part2 --- public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js index e033db5766..236c80b05a 100644 --- a/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js +++ b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js @@ -22,8 +22,8 @@ var editor = myCodeMirror; // Hijack tab key to insert two spaces instead editor.setOption("extraKeys", { Tab: function(cm) { - var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); - cm.replaceSelection(spaces); + var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); + cm.replaceSelection(spaces); }, "Ctrl-Enter": function() { return false; From 1320a1485123eaa758c3f69c8d317b5c700225f0 Mon Sep 17 00:00:00 2001 From: MrRenter Date: Tue, 17 Mar 2015 03:15:00 -0400 Subject: [PATCH 5/7] fixed crash bug if user was logged off --- controllers/story.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/controllers/story.js b/controllers/story.js index 97f31d16cd..c8f1f965c4 100644 --- a/controllers/story.js +++ b/controllers/story.js @@ -137,15 +137,18 @@ exports.returnIndividualStory = function(req, res, next) { return res.redirect('../stories/' + dashedNameFull); } - - var votedObj = story.upVotes.filter(function(a){ - return a['upVotedByUsername'] === req.user['profile']['username']; - }) var userVoted = false; - if (votedObj.length > 0){ - userVoted = true; - } + try { + var votedObj = story.upVotes.filter(function(a){ + return a['upVotedByUsername'] === req.user['profile']['username']; + }) + if (votedObj.length > 0){ + userVoted = true; + } + } catch(err){ + userVoted = false; + } res.render('stories/index', { title: story.headline, link: story.link, From 2d5b34802b2f5229854b0a8eab329bd86a1ff3a1 Mon Sep 17 00:00:00 2001 From: MrRenter Date: Tue, 17 Mar 2015 03:20:07 -0400 Subject: [PATCH 6/7] so spaces and tabs are totally differnt...whitespace fixes --- controllers/story.js | 19 +++++++++---------- public/js/main.js | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/controllers/story.js b/controllers/story.js index c8f1f965c4..f615c8210a 100644 --- a/controllers/story.js +++ b/controllers/story.js @@ -139,16 +139,15 @@ exports.returnIndividualStory = function(req, res, next) { var userVoted = false; try { - var votedObj = story.upVotes.filter(function(a){ - return a['upVotedByUsername'] === req.user['profile']['username']; - }) - - if (votedObj.length > 0){ - userVoted = true; - } - } catch(err){ - userVoted = false; - } + var votedObj = story.upVotes.filter(function(a){ + return a['upVotedByUsername'] === req.user['profile']['username']; + }) + if (votedObj.length > 0){ + userVoted = true; + } + } catch(err){ + userVoted = false; + } res.render('stories/index', { title: story.headline, link: story.link, diff --git a/public/js/main.js b/public/js/main.js index 5979fd88c6..e03a864b9e 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -121,7 +121,7 @@ $(document).ready(function() { var upvoteHandler = function () { $(".ion-arrow-up-b").hide(); - var _id = storyId; + var _id = storyId; $('#upvote').unbind('click'); var alreadyUpvoted = false; for (var i = 0; i < upVotes.length; i++) { From 7d83453259b66ff8501d1627c245cf2e32e84493 Mon Sep 17 00:00:00 2001 From: Renter Date: Tue, 17 Mar 2015 03:32:41 -0400 Subject: [PATCH 7/7] Update story.js fixed link 151 spacing --- controllers/story.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/story.js b/controllers/story.js index f615c8210a..7a2d222238 100644 --- a/controllers/story.js +++ b/controllers/story.js @@ -148,7 +148,7 @@ exports.returnIndividualStory = function(req, res, next) { } catch(err){ userVoted = false; } - res.render('stories/index', { + res.render('stories/index', { title: story.headline, link: story.link, author: story.author,