Merge branch 'master' of asdf.us:bucky3

2 files changed, 19 insertions, 5 deletions

diff --git a/public/assets/js/lib/views/details/comments.js b/public/assets/js/lib/views/details/comments.js
index b1c86bb..1e8d127 100644
--- a/public/assets/js/lib/views/details/comments.js
+++ b/public/assets/js/lib/views/details/comments.js
@@ -14,8 +14,8 @@ var CommentsView = FormView.extend({
     this.$formRow = this.$("#comment_form")
   },
   
-  load: function(comments, thread){
-console.log(comments)
+  load: function(comments, thread) {
+    // console.log(comments)
     thread = this.thread = thread || this.thread
     if (thread.settings.hootbox) {
       comments
@@ -35,13 +35,13 @@ console.log(comments)
     }
   },
   
-  parse: function(comment){
+  parse: function(comment) {
     if (! comment.comment.length) return $('')
     var datetime = verbose_date(comment.date, true)
     var t = this.template.replace(/{{image}}/g, profile_image(comment.username))
                          .replace(/{{username}}/g, comment.username)
                          .replace(/{{id}}/g, comment.id)
-                         .replace(/{{comment}}/g, tidy_urls(comment.comment))
+                         .replace(/{{comment}}/g, function(){ return tidy_urls(comment.comment) })
                          .replace(/{{date}}/g, datetime[0])
                          .replace(/{{time}}/g, datetime[1])
     var $t = $(t)
diff --git a/public/assets/js/util/color.js b/public/assets/js/util/color.js
index 6d33a72..ec21925 100644
--- a/public/assets/js/util/color.js
+++ b/public/assets/js/util/color.js
@@ -65,6 +65,19 @@ var COLORS = {
   black: new Color(32,32,37),
 }
 
+var DARK_COLORS = {
+  plain: new Color(24,10,10),
+  ivory: new Color(18,18,18),
+  pink: new Color(40,23,35),
+  red: new Color(40,24,23),
+  orange: new Color(40,32,23),
+  yellow: new Color(40,40,31),
+  green: new Color(33,40,31),
+  blue: new Color(24,26,40),
+  purple: new Color(35,31,40),
+  black: new Color(0,0,0),
+}
+
 function nighttime_quotient() {
   var q = -10;
   var date = new Date()
@@ -111,7 +124,8 @@ function set_background_color_from_time(){
 }
 function set_background_color(color_name){
   color_name = color_name || "plain"
-  var color = COLORS[color_name]
+  var color_set = window.matchMedia('(prefers-color-scheme: dark)').matches ? DARK_COLORS : COLORS
+  var color = color_set[color_name]
     .clone()
     .mottleRGB(4,4,8)
 //     .add(nighttime_quotient())