diff options
| -rw-r--r-- | src/site.clj | 20 | ||||
| -rw-r--r-- | static/js/pichat.js | 21 | ||||
| -rw-r--r-- | static/js/pichat2.js | 21 | ||||
| -rw-r--r-- | static/js/src/chat.js | 2 | ||||
| -rw-r--r-- | static/js/src/drag.js | 18 |
5 files changed, 49 insertions, 33 deletions
diff --git a/src/site.clj b/src/site.clj index f38c67b..df15342 100644 --- a/src/site.clj +++ b/src/site.clj @@ -193,6 +193,13 @@ ;; Landing +(defn serve-meme [session meme] + (if-let [st (fetch-template meme session)] + (let [now (System/currentTimeMillis)] + (.setAttribute st "timestamp" now) + (.toString st)) + (unknown-page))) + (defn- parse-front-page-date [dt-str] (if-let [dt (parse-yyyymmdd-date dt-str)] [(advance-date dt -1) @@ -219,13 +226,15 @@ (def num-frontpage-dumps 20) (defn front-page - ([session] (front-page session (format-yyyymmdd (Date.)))) + ([session] + (cond + (not (:nick session)) (serve-meme session "fullscreen") + :else (front-page session (format-yyyymmdd (Date.))) )) ([session dt-str] (let [today (Date.)] (if-let [[prev-date cur-date next-date] (parse-front-page-date dt-str)] (cond (.before cur-date earliest-daily-hall) (redirect-to "/") (.after cur-date today) (redirect-to "/") - ;(not (:nick session)) (serve-meme session "fullscreen") :else (let [st (fetch-template "frontpage" session) dumps (map process-message-for-output (if (:nick session) @@ -1159,13 +1168,6 @@ WHERE user_id IN [200 err] (do-upload-avatar session image))))) -(defn serve-meme [session meme] - (if-let [st (fetch-template meme session)] - (let [now (System/currentTimeMillis)] - (.setAttribute st "timestamp" now) - (.toString st)) - (unknown-page))) - (defn hall-of-fame [session] (let [st (fetch-template "fame" session) msgs (fetch-redis-hall (:nick session))] diff --git a/static/js/pichat.js b/static/js/pichat.js index 5f20803..ceeb397 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -445,7 +445,7 @@ function removeOldMessages(){ } } -window.TextEnabled = Preferences.getProperty("chat.textEnabled", "true") == "none"; +window.TextEnabled = Preferences.getProperty("chat.textEnabled", "true") == "true"; window.ImgsEnabled = Preferences.getProperty("chat.imgsEnabled", "true") == "true"; function muteSelector() { @@ -547,6 +547,7 @@ function dragTarget (target, callbacks) { } base.enter = function(e){ base.target.classList.add('over'); + console.log(e.target); if ('enter' in callbacks) { callbacks.enter(Drag.url); } @@ -577,17 +578,21 @@ function dragTarget (target, callbacks) { } base.drop = function(e){ base.target.classList.remove('over'); - if (e.stopPropagation) { - e.stopPropagation(); // stops the browser from redirecting. - } - if (e.preventDefault) { - e.preventDefault(); - } + e.stopPropagation(); // stops the browser from redirecting. + e.preventDefault(); if ('drop' in callbacks) { - callbacks.drop(Drag.url); + if (e.dataTransfer) { + var url = e.dataTransfer.getData("url"); + if (url) { + callbacks.drop(url); + } + } else { + callbacks.drop(Drag.url); + } } return false; } + base.init(); }; diff --git a/static/js/pichat2.js b/static/js/pichat2.js index 5f20803..ceeb397 100644 --- a/static/js/pichat2.js +++ b/static/js/pichat2.js @@ -445,7 +445,7 @@ function removeOldMessages(){ } } -window.TextEnabled = Preferences.getProperty("chat.textEnabled", "true") == "none"; +window.TextEnabled = Preferences.getProperty("chat.textEnabled", "true") == "true"; window.ImgsEnabled = Preferences.getProperty("chat.imgsEnabled", "true") == "true"; function muteSelector() { @@ -547,6 +547,7 @@ function dragTarget (target, callbacks) { } base.enter = function(e){ base.target.classList.add('over'); + console.log(e.target); if ('enter' in callbacks) { callbacks.enter(Drag.url); } @@ -577,17 +578,21 @@ function dragTarget (target, callbacks) { } base.drop = function(e){ base.target.classList.remove('over'); - if (e.stopPropagation) { - e.stopPropagation(); // stops the browser from redirecting. - } - if (e.preventDefault) { - e.preventDefault(); - } + e.stopPropagation(); // stops the browser from redirecting. + e.preventDefault(); if ('drop' in callbacks) { - callbacks.drop(Drag.url); + if (e.dataTransfer) { + var url = e.dataTransfer.getData("url"); + if (url) { + callbacks.drop(url); + } + } else { + callbacks.drop(Drag.url); + } } return false; } + base.init(); }; diff --git a/static/js/src/chat.js b/static/js/src/chat.js index 09954de..f24917c 100644 --- a/static/js/src/chat.js +++ b/static/js/src/chat.js @@ -166,7 +166,7 @@ function removeOldMessages(){ } } -window.TextEnabled = Preferences.getProperty("chat.textEnabled", "true") == "none"; +window.TextEnabled = Preferences.getProperty("chat.textEnabled", "true") == "true"; window.ImgsEnabled = Preferences.getProperty("chat.imgsEnabled", "true") == "true"; function muteSelector() { diff --git a/static/js/src/drag.js b/static/js/src/drag.js index b48c365..48b3266 100644 --- a/static/js/src/drag.js +++ b/static/js/src/drag.js @@ -45,17 +45,21 @@ function dragTarget (target, callbacks) { } base.drop = function(e){ base.target.classList.remove('over'); - if (e.stopPropagation) { - e.stopPropagation(); // stops the browser from redirecting. - } - if (e.preventDefault) { - e.preventDefault(); - } + e.stopPropagation(); // stops the browser from redirecting. + e.preventDefault(); if ('drop' in callbacks) { - callbacks.drop(Drag.url); + if (e.dataTransfer) { + var url = e.dataTransfer.getData("url"); + if (url) { + callbacks.drop(url); + } + } else { + callbacks.drop(Drag.url); + } } return false; } + base.init(); }; |