From da15cfb1e452a0af4902272ba351d5a6d0d0b56a Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Tue, 17 Jul 2012 21:40:57 -0400 Subject: update src, scripts, etc from 2012 --- static/js/fullscreen.js | 355 ++++++++++++++++++++++++++++++++++++++++++++++-- static/js/pichat.js | 229 +++++++++++++++++++++++++++++-- static/js/register.js | 4 +- 3 files changed, 558 insertions(+), 30 deletions(-) (limited to 'static/js') diff --git a/static/js/fullscreen.js b/static/js/fullscreen.js index f99d48b..5b46519 100644 --- a/static/js/fullscreen.js +++ b/static/js/fullscreen.js @@ -1,5 +1,6 @@ function initFullscreen(room){ Room = room || "dumpfm"; + // Timestamp = Timestamp || Date.now(); refresh(); ImageCache = []; SeenImages = {}; @@ -87,20 +88,8 @@ function refresh() { } function initLogin() { - $('#logininner').ridgificate('2px solid #dd0000', - '2px solid #fe6230', - '2px solid #fef600', - '2px solid #00bc00', - '2px solid #009bfe', - '2px solid #000083', - '2px solid #30009b', - '2px solid #dd0000', - '2px solid #fe6230', - '2px solid #fef600', - '2px solid #00bc00', - '2px solid #009bfe', - '2px solid #000083', - '2px solid #30009b'); + $('#logininner').ridgificate('1px solid #000' + ); } function showLogin() { @@ -126,6 +115,7 @@ function login() { LoggedIn = true; $('#loginbox').hide(); $('.sublogo').text('click to fav'); + window.location.href = "/chat"; }; var onError = function(resp, textStatus, errorThrown) { @@ -182,4 +172,339 @@ $(function() { $('#memelogo').stop(true, false).animate({opacity: 1.0}, "fast").delay(LogoFadeDelay).animate({opacity: 0}, "slow"); }); $('#memelogo').delay(LogoFadeDelay).animate({opacity: 0}, "slow"); -}); \ No newline at end of file +}); + + +// sha1.js + +/* + * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined + * in FIPS 180-1 + * Version 2.2 Copyright Paul Johnston 2000 - 2009. + * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet + * Distributed under the BSD License + * See http://pajhome.org.uk/crypt/md5 for details. + */ + +/* + * Configurable variables. You may need to tweak these to be compatible with + * the server-side, but the defaults work in most cases. + */ +var hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */ +var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */ + +/* + * These are the functions you'll usually want to call + * They take string arguments and return either hex or base-64 encoded strings + */ +function hex_sha1(s) { return rstr2hex(rstr_sha1(str2rstr_utf8(s))); } +function b64_sha1(s) { return rstr2b64(rstr_sha1(str2rstr_utf8(s))); } +function any_sha1(s, e) { return rstr2any(rstr_sha1(str2rstr_utf8(s)), e); } +function hex_hmac_sha1(k, d) + { return rstr2hex(rstr_hmac_sha1(str2rstr_utf8(k), str2rstr_utf8(d))); } +function b64_hmac_sha1(k, d) + { return rstr2b64(rstr_hmac_sha1(str2rstr_utf8(k), str2rstr_utf8(d))); } +function any_hmac_sha1(k, d, e) + { return rstr2any(rstr_hmac_sha1(str2rstr_utf8(k), str2rstr_utf8(d)), e); } + +/* + * Perform a simple self-test to see if the VM is working + */ +function sha1_vm_test() +{ + return hex_sha1("abc").toLowerCase() == "a9993e364706816aba3e25717850c26c9cd0d89d"; +} + +/* + * Calculate the SHA1 of a raw string + */ +function rstr_sha1(s) +{ + return binb2rstr(binb_sha1(rstr2binb(s), s.length * 8)); +} + +/* + * Calculate the HMAC-SHA1 of a key and some data (raw strings) + */ +function rstr_hmac_sha1(key, data) +{ + var bkey = rstr2binb(key); + if(bkey.length > 16) bkey = binb_sha1(bkey, key.length * 8); + + var ipad = Array(16), opad = Array(16); + for(var i = 0; i < 16; i++) + { + ipad[i] = bkey[i] ^ 0x36363636; + opad[i] = bkey[i] ^ 0x5C5C5C5C; + } + + var hash = binb_sha1(ipad.concat(rstr2binb(data)), 512 + data.length * 8); + return binb2rstr(binb_sha1(opad.concat(hash), 512 + 160)); +} + +/* + * Convert a raw string to a hex string + */ +function rstr2hex(input) +{ + try { hexcase } catch(e) { hexcase=0; } + var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef"; + var output = ""; + var x; + for(var i = 0; i < input.length; i++) + { + x = input.charCodeAt(i); + output += hex_tab.charAt((x >>> 4) & 0x0F) + + hex_tab.charAt( x & 0x0F); + } + return output; +} + +/* + * Convert a raw string to a base-64 string + */ +function rstr2b64(input) +{ + try { b64pad } catch(e) { b64pad=''; } + var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + var output = ""; + var len = input.length; + for(var i = 0; i < len; i += 3) + { + var triplet = (input.charCodeAt(i) << 16) + | (i + 1 < len ? input.charCodeAt(i+1) << 8 : 0) + | (i + 2 < len ? input.charCodeAt(i+2) : 0); + for(var j = 0; j < 4; j++) + { + if(i * 8 + j * 6 > input.length * 8) output += b64pad; + else output += tab.charAt((triplet >>> 6*(3-j)) & 0x3F); + } + } + return output; +} + +/* + * Convert a raw string to an arbitrary string encoding + */ +function rstr2any(input, encoding) +{ + var divisor = encoding.length; + var remainders = Array(); + var i, q, x, quotient; + + /* Convert to an array of 16-bit big-endian values, forming the dividend */ + var dividend = Array(Math.ceil(input.length / 2)); + for(i = 0; i < dividend.length; i++) + { + dividend[i] = (input.charCodeAt(i * 2) << 8) | input.charCodeAt(i * 2 + 1); + } + + /* + * Repeatedly perform a long division. The binary array forms the dividend, + * the length of the encoding is the divisor. Once computed, the quotient + * forms the dividend for the next step. We stop when the dividend is zero. + * All remainders are stored for later use. + */ + while(dividend.length > 0) + { + quotient = Array(); + x = 0; + for(i = 0; i < dividend.length; i++) + { + x = (x << 16) + dividend[i]; + q = Math.floor(x / divisor); + x -= q * divisor; + if(quotient.length > 0 || q > 0) + quotient[quotient.length] = q; + } + remainders[remainders.length] = x; + dividend = quotient; + } + + /* Convert the remainders to the output string */ + var output = ""; + for(i = remainders.length - 1; i >= 0; i--) + output += encoding.charAt(remainders[i]); + + /* Append leading zero equivalents */ + var full_length = Math.ceil(input.length * 8 / + (Math.log(encoding.length) / Math.log(2))) + for(i = output.length; i < full_length; i++) + output = encoding[0] + output; + + return output; +} + +/* + * Encode a string as utf-8. + * For efficiency, this assumes the input is valid utf-16. + */ +function str2rstr_utf8(input) +{ + var output = ""; + var i = -1; + var x, y; + + while(++i < input.length) + { + /* Decode utf-16 surrogate pairs */ + x = input.charCodeAt(i); + y = i + 1 < input.length ? input.charCodeAt(i + 1) : 0; + if(0xD800 <= x && x <= 0xDBFF && 0xDC00 <= y && y <= 0xDFFF) + { + x = 0x10000 + ((x & 0x03FF) << 10) + (y & 0x03FF); + i++; + } + + /* Encode output as utf-8 */ + if(x <= 0x7F) + output += String.fromCharCode(x); + else if(x <= 0x7FF) + output += String.fromCharCode(0xC0 | ((x >>> 6 ) & 0x1F), + 0x80 | ( x & 0x3F)); + else if(x <= 0xFFFF) + output += String.fromCharCode(0xE0 | ((x >>> 12) & 0x0F), + 0x80 | ((x >>> 6 ) & 0x3F), + 0x80 | ( x & 0x3F)); + else if(x <= 0x1FFFFF) + output += String.fromCharCode(0xF0 | ((x >>> 18) & 0x07), + 0x80 | ((x >>> 12) & 0x3F), + 0x80 | ((x >>> 6 ) & 0x3F), + 0x80 | ( x & 0x3F)); + } + return output; +} + +/* + * Encode a string as utf-16 + */ +function str2rstr_utf16le(input) +{ + var output = ""; + for(var i = 0; i < input.length; i++) + output += String.fromCharCode( input.charCodeAt(i) & 0xFF, + (input.charCodeAt(i) >>> 8) & 0xFF); + return output; +} + +function str2rstr_utf16be(input) +{ + var output = ""; + for(var i = 0; i < input.length; i++) + output += String.fromCharCode((input.charCodeAt(i) >>> 8) & 0xFF, + input.charCodeAt(i) & 0xFF); + return output; +} + +/* + * Convert a raw string to an array of big-endian words + * Characters >255 have their high-byte silently ignored. + */ +function rstr2binb(input) +{ + var output = Array(input.length >> 2); + for(var i = 0; i < output.length; i++) + output[i] = 0; + for(var i = 0; i < input.length * 8; i += 8) + output[i>>5] |= (input.charCodeAt(i / 8) & 0xFF) << (24 - i % 32); + return output; +} + +/* + * Convert an array of big-endian words to a string + */ +function binb2rstr(input) +{ + var output = ""; + for(var i = 0; i < input.length * 32; i += 8) + output += String.fromCharCode((input[i>>5] >>> (24 - i % 32)) & 0xFF); + return output; +} + +/* + * Calculate the SHA-1 of an array of big-endian words, and a bit length + */ +function binb_sha1(x, len) +{ + /* append padding */ + x[len >> 5] |= 0x80 << (24 - len % 32); + x[((len + 64 >> 9) << 4) + 15] = len; + + var w = Array(80); + var a = 1732584193; + var b = -271733879; + var c = -1732584194; + var d = 271733878; + var e = -1009589776; + + for(var i = 0; i < x.length; i += 16) + { + var olda = a; + var oldb = b; + var oldc = c; + var oldd = d; + var olde = e; + + for(var j = 0; j < 80; j++) + { + if(j < 16) w[j] = x[i + j]; + else w[j] = bit_rol(w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16], 1); + var t = safe_add(safe_add(bit_rol(a, 5), sha1_ft(j, b, c, d)), + safe_add(safe_add(e, w[j]), sha1_kt(j))); + e = d; + d = c; + c = bit_rol(b, 30); + b = a; + a = t; + } + + a = safe_add(a, olda); + b = safe_add(b, oldb); + c = safe_add(c, oldc); + d = safe_add(d, oldd); + e = safe_add(e, olde); + } + return Array(a, b, c, d, e); + +} + +/* + * Perform the appropriate triplet combination function for the current + * iteration + */ +function sha1_ft(t, b, c, d) +{ + if(t < 20) return (b & c) | ((~b) & d); + if(t < 40) return b ^ c ^ d; + if(t < 60) return (b & c) | (b & d) | (c & d); + return b ^ c ^ d; +} + +/* + * Determine the appropriate additive constant for the current iteration + */ +function sha1_kt(t) +{ + return (t < 20) ? 1518500249 : (t < 40) ? 1859775393 : + (t < 60) ? -1894007588 : -899497514; +} + +/* + * Add integers, wrapping at 2^32. This uses 16-bit operations internally + * to work around bugs in some JS interpreters. + */ +function safe_add(x, y) +{ + var lsw = (x & 0xFFFF) + (y & 0xFFFF); + var msw = (x >> 16) + (y >> 16) + (lsw >> 16); + return (msw << 16) | (lsw & 0xFFFF); +} + +/* + * Bitwise rotate a 32-bit number to the left. + */ +function bit_rol(num, cnt) +{ + return (num << cnt) | (num >>> (32 - cnt)); +} + diff --git a/static/js/pichat.js b/static/js/pichat.js index afddec7..6eb5553 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -82,7 +82,7 @@ var Preferences = { function escapeHtml(txt) { if (!txt) { return ""; } -// txt = annoyingCaps(txt) + // txt = annoyingCaps(txt) return $("").text(txt).html() } @@ -223,7 +223,7 @@ function linkReplace(url) { if (type == 'image') { LastMsgContainsImage = true; - return ""; + return ""; } else if (type == 'youtube') { Youtube.startAnimation(); return "" + @@ -323,15 +323,23 @@ function removeOldMessages(){ } } -var TextEnabled = Preferences.getProperty("chat.textEnabled", "true") == "true"; +var TextEnabled = Preferences.getProperty("chat.textEnabled", "true") == "none"; var ImgsEnabled = Preferences.getProperty("chat.imgsEnabled", "true") == "true"; +function muteSelector() { + var muted = []; + for (nick in MUTES) { + muted.push(".nick_" + nick); + } + return muted.join(","); +} function setTextEnable() { + var muted = muteSelector(); if ($(this).attr('checked')) { TextEnabled = true; - Preferences.setProperty("chat.textEnabled", "true"); + Preferences.setProperty("chat.textEnabled", "false"); track('UI', 'TextEnabled'); - $('.dump').not('.contains-image').show(); + $('.dump').not('.contains-image,'+muted).show(); } else { TextEnabled = false; Preferences.setProperty("chat.textEnabled", "false"); @@ -341,11 +349,12 @@ function setTextEnable() { }; function setImgsEnable() { + var muted = muteSelector(); if ($(this).attr('checked')) { ImgsEnabled = true; Preferences.setProperty("chat.imgsEnabled", "true"); track('UI', 'ImgsEnabled'); - $('.contains-image').show(); + $('.contains-image').not(muted).show(); } else { ImgsEnabled = false; Preferences.setProperty("chat.imgsEnabled", "false"); @@ -372,8 +381,10 @@ function buildMessageDiv(msg, opts) { var loadingClass = opts.isLoading ? ' loading' : ''; var containsImageClass = LastMsgContainsImage ? ' contains-image' : ''; var displayStyle = ((ImgsEnabled && LastMsgContainsImage) || (TextEnabled && !LastMsgContainsImage)) ? '' : ' style="display: none"'; + if (displayStyle === '' && MUTES[nick]) + displayStyle = ' style="display: none"'; - return '
' + return '
' + '' + nick + '' + ' ' + '' @@ -381,17 +392,42 @@ function buildMessageDiv(msg, opts) { + '
'; } +var MUTES = {}; +$(".mute").live("click", function(){ + $(this).removeClass("mute"); + $(this).addClass("unmute"); + $(this).html("o"); + var nick = $(this).parent().children("a").html().replace(/]+>/,""); + $(".nick_" + nick).hide(); + MUTES[nick] = true; +}); +$(".unmute").live("click", function(){ + $(this).removeClass("unmute"); + $(this).addClass("mute"); + $(this).html("x"); + var nick = $(this).parent().children("a").html().replace(/]+>/,""); + $(".nick_" + nick).show(); + delete MUTES[nick]; +}); + function buildUserDiv(user) { + var muted = MUTES[user.nick] ? 'o' : 'x'; if (user.avatar) { return '
' + + muted + '' + '' - + escapeHtml(user.nick) + '
'; + + escapeHtml(user.nick) + + '' + + '
'; } else { return '
' + + muted + '' + '' - + escapeHtml(user.nick) + '
'; + + escapeHtml(user.nick) + + '' + + ''; } } @@ -425,7 +461,8 @@ function showFav(f) { function updateFavs(fs) { if (fs.length == 0) return; - $('#favbox').show(); +console.log("new faves"); + $('#favbox').show(); $(fs).each(function(i, f) { showFav(f) }); } @@ -538,11 +575,13 @@ function ifEnter(fn) { function addNewMessages(msgs) { var msgStr = $.map(msgs, buildMessageDiv).join(''); $('#messageList').append(msgStr); + Drag.bindImages(); } function addNewMessage(msg, isLoading) { var msgStr = buildMessageDiv(msg, { isLoading: true }); var div = $(msgStr).appendTo('#messageList'); + Drag.bindImages(); return div; } @@ -567,7 +606,7 @@ function updateUI(msgs, users, favs) { if (users !== null) { var flattened = flattenUserJson(users); if (!('userlist' in cache) || flattened != cache.userlist) { - $("#userList").html($.map(users.sort(sortUsersByAlpha), buildUserDiv).join('')); + $("#userList").html($.map(users.sort(sortUsersByAlpha), buildUserDiv).join('')); } cache.userlist = flattened } @@ -595,17 +634,18 @@ function refresh() { var onSuccess = function(json) { try { Timestamp = json.timestamp; - $.map(json.messages, function(msg){ MessageContentCache[msg.msg_id.toString()] = msg.content }) + $.map(json.messages, function(msg){ MessageContentCache[msg.msg_id.toString()] = msg.content }) var messages = $.grep( json.messages, function(m) { return !isDuplicateMessage(m) }); updateUI(messages, json.users, json.favs); +console.log("update ui"); if (!Away.HasFocus) Away.UnseenMsgCounter += messages.length; } catch(e) { if (IsAdmin && window.console) { - console.error(e); + console.log(e); } } setTimeout(refresh, 1500); @@ -667,6 +707,7 @@ function initChat() { else dump.hide(); }); + Drag.bindImages(); $('#msgInput').keyup(ifEnter(submitMessage)); $('#msgSubmit').click(sendClicked); @@ -1970,3 +2011,165 @@ var SHA1 = { }, "bit_rol": function(num, cnt) { return (num << cnt) | (num >>> (32 - cnt)) } } + +window.Drag = { + 'imgSrc': "", + 'bindImages': function (){ + $('.unbound').each(function(index,img){ + img.addEventListener('dragstart', Drag.start, false); + $(this).removeClass('unbound'); + }); + }, + 'start': function(e){ + // console.log(this); + if (this.src) Drag.imgSrc = this.src; + }, + 'enter': function(e){ + Drag.chatbox.classList.add('over'); + // console.log('enter') + return false; + }, + 'over': function(e){ + if (e.preventDefault) { + e.preventDefault(); // Necessary. Allows us to drop. + } + // console.log('over') + return false; + }, + 'leave': function(e){ + Drag.chatbox.classList.remove('leave'); + // console.log('leave') + return false; + }, + 'end': function(e){ + Drag.chatbox.classList.remove('end'); + // console.log('end') + return false; + }, + 'drop': function(e){ + Drag.chatbox.classList.remove('over'); + if (e.stopPropagation) { + e.stopPropagation(); // stops the browser from redirecting. + } + if (e.preventDefault) { + e.preventDefault(); + } + // console.log('drop'); + Drag.chatbox.value += " " + Drag.imgSrc; + Drag.chatbox.value += " "; + Drag.chatbox.focus(); + // console.log(Drag.imgSrc); + Drag.imgSrc = ""; + // ok.onclick(); + return false; + } +} +$(function(){ + Drag.chatbox = document.getElementById("msgInput"); + if (! Drag.chatbox || $.browser.mozilla) return; + Drag.chatbox.addEventListener('dragenter', Drag.enter, false); + Drag.chatbox.addEventListener('dragover', Drag.over, false); + Drag.chatbox.addEventListener('dragleave', Drag.leave, false); + Drag.chatbox.addEventListener('dragend', Drag.end, false); + Drag.chatbox.addEventListener('drop', Drag.drop, false); +}); + +// generate a new CSS rule and apply it immediately +// (more persistent than dumping a style tag) +window.cssRule = function (selector, declaration) { + var x = document.styleSheets,y=x.length-1; + x[y].insertRule(selector+"{"+declaration+"}",x[y].cssRules.length); + $(selector).css(declaration.split(": ")); +}; + + +// manual fave palette by ohgod +$(function(){ + $('#manual-palette-button').click(manPaletteClicked); + $('#manual-add-button').click(function () { + addManualFav($('#manual-add-url-txt').val().trim()); + $('#manual-add-url-txt').val(""); + }); + $('#manual-remove-button').click(function () { + removeManualFav($('#manual-add-url-txt').val().trim()); + $('#manual-add-url-txt').val(""); + }); +}); + +function manPaletteClicked() { + if ($("#manual-palette").css("display") == "none") { + manPaletteShow(); + } else { + $("#manual-palette").css("display", "none"); + $("#manual-palette-thumbs").html(""); + } +}; + +function manPaletteShow() { + $("#manual-palette").show(); + if (! hasLocalStorage()) { + $('#manual-palette-localstorage-error').show() + } else if (manPaletteIsEmpty()) { + $('#manual-palette-thumbs-empty').show(); + } else { + manualPaletteBuildImageThumbs(); + } +}; + +function hasLocalStorage() { + try { + return 'localStorage' in window && window['localStorage'] !== null; + } catch (e) { + return false; + } +} + +function manPaletteIsEmpty() { + return localStorage.manual_favs === undefined || localStorage.manual_favs === "[]" || localStorage.manual_favs === ""; +}; + +function getManualFaves() { + return localStorage.manual_favs ? JSON.parse(localStorage.manual_favs) : []; +}; + +function setManualFaves(mfavs) { + localStorage.manual_favs = JSON.stringify(mfavs); +}; + +function manualPaletteBuildImageThumbs() { + var imgs = JSON.parse(localStorage.manual_favs); + if (imgs && imgs.length != 0) { + for (var i = 0; i < imgs.length; i++) { + $("#manual-palette-thumbs").append(""); + } + } +}; + +function addManualFav(imgsrc) { + if (!imgsrc) return; + if (hasLocalStorage()) { + if (manPaletteIsEmpty()) + $("#manual-palette-thumbs").html(""); + var mfavs = getManualFaves(); + if ($.inArray(imgsrc, mfavs) == -1) { + mfavs.push(imgsrc); + setManualFaves(mfavs); + $("#manual-palette-thumbs").append(""); + } + } +}; + +function removeManualFav(imgsrc) { + if (hasLocalStorage()) { + var mfavs = getManualFaves(); + var idx = $.inArray(imgsrc, mfavs); + if (idx != -1) { + mfavs.splice(idx, 1); + setManualFaves(mfavs); + $("#manual-palette-thumbs").html(""); + manualPaletteBuildImageThumbs(); + } + } +}; + + diff --git a/static/js/register.js b/static/js/register.js index c767e92..0f5bb1f 100755 --- a/static/js/register.js +++ b/static/js/register.js @@ -34,7 +34,7 @@ function submitRegistration() { if (window.history && history.length > 1) history.go(-1); else - location.href = '/'; + location.href = 'http://dump.fm/'; }; var onError = function(resp) { @@ -54,7 +54,7 @@ function submitRegistration() { $.ajax({ type: 'POST', timeout: 5000, - url: '/submit-registration', + url: '/dubmit-registration', data: {'nick': nick, 'email': email, 'hash': hash }, cache: false, dataType: 'json', -- cgit v1.2.3-70-g09d2