diff options
Diffstat (limited to 'static')
| -rw-r--r-- | static/js/pichat.js | 18 | ||||
| -rw-r--r-- | static/webcam/webcam.js | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/static/js/pichat.js b/static/js/pichat.js index bdd2471..111f574 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -22,22 +22,20 @@ isEmptyObject = function(obj) { } -function isCSSPropertySupported(prop){ - return prop in document.body.style; -} +function isCSSPropertySupported(prop){ return prop in document.body.style } function escapeHtml(txt) { if (!txt) { return ""; } else { return $("<span>").text(txt).html(); } } - URLRegex = /((\b(http\:\/\/|https\:\/\/|ftp\:\/\/)|(www\.))+(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi; PicRegex = /\.(jpg|jpeg|png|gif|bmp)$/i; function getImagesAsArray(text) { var imgs = [] var urls = text.match(URLRegex) + if (urls === null) return imgs for (var i = 0; i<urls.length; i++){ var url = urls[i] var urlWithoutParams = url.replace(/\?.*$/i, ""); @@ -319,9 +317,11 @@ function refresh() { } function initChat() { - $('.msgDiv .content').each(function() { - var t = $(this); - t.html(buildMsgContent(t.text())); + $('.oldmsg').each(function() { + var dump = $(this); + var content = dump.find(".content") + MessageContentCache[dump.attr("id").substr(8)] = content.text() + content.html(buildMsgContent(content.text())); }); $('#msgInput').keyup(ifEnter(submitMessage)); @@ -809,7 +809,9 @@ Tag = { } else { Tag.add(message.id, "favorite") $(button).parents(".dump").addClass("favorite") - if (RawFavs && MessageContentCache[message.id]) { + if (RawFavs && MessageContentCache[message.id]) { // chat ui stuff + if ($("#palette-button").css("display") == "none") + paletteButtonShowAnim() RawFavs[message.id] = MessageContentCache[message.id] paletteImageCache = false } diff --git a/static/webcam/webcam.js b/static/webcam/webcam.js index f2e287b..aa7bf0a 100644 --- a/static/webcam/webcam.js +++ b/static/webcam/webcam.js @@ -57,7 +57,7 @@ window.webcam = { $("#webcam-button-upload").addClass("invisible") $("#webcam-button-snap").removeClass("invisible") $("#effects-msg").removeClass("invisible").fadeOut(70000) - + paletteHide() blinkStart() }, |