"+(escaped?code:escape(code,true))+"\n'+(escaped?code:escape(code,true))+"\n\n"+quote+"\n"};Renderer.prototype.html=function(html){return html};Renderer.prototype.heading=function(text,level,raw){return"
\n":"
\n"};Renderer.prototype.list=function(body,ordered){var type=ordered?"ol":"ul";return"<"+type+">\n"+body+"\n"};Renderer.prototype.listitem=function(text){return"
"+text+"
\n"};Renderer.prototype.table=function(header,body){return""+text+""};Renderer.prototype.br=function(){return this.options.xhtml?"":"
"};Renderer.prototype.del=function(text){return"
"+escape(e.message+"",true)+""}throw e}}marked.options=marked.setOptions=function(opt){merge(marked.defaults,opt);return marked};marked.defaults={gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,smartLists:false,silent:false,highlight:null,langPrefix:"lang-",smartypants:false,headerPrefix:"",renderer:new Renderer,xhtml:false};marked.Parser=Parser;marked.parser=Parser.parse;marked.Renderer=Renderer;marked.Lexer=Lexer;marked.lexer=Lexer.lex;marked.InlineLexer=InlineLexer;marked.inlineLexer=InlineLexer.output;marked.parse=marked;if(typeof module!=="undefined"&&typeof exports==="object"){module.exports=marked}else if(typeof define==="function"&&define.amd){define(function(){return marked})}else{this.marked=marked}}).call(function(){return this||(typeof window!=="undefined"?window:global)}()); +!function(e){"use strict";var k={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:f,hr:/^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *(?:#+ *)?(?:\n+|$)/,nptable:f,blockquote:/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,list:/^( {0,3})(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:"^ {0,3}(?:<(script|pre|style)[\\s>][\\s\\S]*?(?:[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?\\?>\\n*|\\n*|\\n*|)[\\s\\S]*?(?:\\n{2,}|$)|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$)|(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$))",def:/^ {0,3}\[(label)\]: *\n? *]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,table:f,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,paragraph:/^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)*)/,text:/^[^\n]+/};function a(e){this.tokens=[],this.tokens.links=Object.create(null),this.options=e||b.defaults,this.rules=k.normal,this.options.pedantic?this.rules=k.pedantic:this.options.gfm&&(this.options.tables?this.rules=k.tables:this.rules=k.gfm)}k._label=/(?!\s*\])(?:\\[\[\]]|[^\[\]])+/,k._title=/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/,k.def=i(k.def).replace("label",k._label).replace("title",k._title).getRegex(),k.bullet=/(?:[*+-]|\d{1,9}\.)/,k.item=/^( *)(bull) ?[^\n]*(?:\n(?!\1bull ?)[^\n]*)*/,k.item=i(k.item,"gm").replace(/bull/g,k.bullet).getRegex(),k.list=i(k.list).replace(/bull/g,k.bullet).replace("hr","\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def","\\n+(?="+k.def.source+")").getRegex(),k._tag="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",k._comment=//,k.html=i(k.html,"i").replace("comment",k._comment).replace("tag",k._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),k.paragraph=i(k.paragraph).replace("hr",k.hr).replace("heading",k.heading).replace("lheading",k.lheading).replace("tag",k._tag).getRegex(),k.blockquote=i(k.blockquote).replace("paragraph",k.paragraph).getRegex(),k.normal=d({},k),k.gfm=d({},k.normal,{fences:/^ {0,3}(`{3,}|~{3,})([^`\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/,paragraph:/^/,heading:/^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/}),k.gfm.paragraph=i(k.paragraph).replace("(?!","(?!"+k.gfm.fences.source.replace("\\1","\\2")+"|"+k.list.source.replace("\\1","\\3")+"|").getRegex(),k.tables=d({},k.gfm,{nptable:/^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,table:/^ *\|(.+)\n *\|?( *[-:]+[-| :]*)(?:\n((?: *[^>\n ].*(?:\n|$))*)\n*|$)/}),k.pedantic=d({},k.normal,{html:i("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)|
'+(n?e:u(e,!0))+"\n":""+(n?e:u(e,!0))+"\n"+e+"\n"},r.prototype.html=function(e){return e},r.prototype.heading=function(e,t,n,r){return this.options.headerIds?"
\n":"
\n"},r.prototype.list=function(e,t,n){var r=t?"ol":"ul";return"<"+r+(t&&1!==n?' start="'+n+'"':"")+">\n"+e+"\n"},r.prototype.listitem=function(e){return"
"+e+"
\n"},r.prototype.table=function(e,t){return t&&(t=""+t+""),""+e+""},r.prototype.br=function(){return this.options.xhtml?"":"
"},r.prototype.del=function(e){return"
"+u(e.message+"",!0)+"";throw e}}f.exec=f,b.options=b.setOptions=function(e){return d(b.defaults,e),b},b.getDefaults=function(){return{baseUrl:null,breaks:!1,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:new r,sanitize:!1,sanitizer:null,silent:!1,smartLists:!1,smartypants:!1,tables:!0,xhtml:!1}},b.defaults=b.getDefaults(),b.Parser=h,b.parser=h.parse,b.Renderer=r,b.TextRenderer=s,b.Lexer=a,b.lexer=a.lex,b.InlineLexer=p,b.inlineLexer=p.output,b.Slugger=t,b.parse=b,"undefined"!=typeof module&&"object"==typeof exports?module.exports=b:"function"==typeof define&&define.amd?define(function(){return b}):e.marked=b}(this||("undefined"!=typeof window?window:global)); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/Animation.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/Animation.coffee ---- */ (function() { @@ -1324,8 +1331,8 @@ function clone(obj) { }; Animation.prototype.show = function(elem, props) { - var delay, _ref; - delay = ((_ref = arguments[arguments.length - 2]) != null ? _ref.delay : void 0) * 1000 || 1; + var delay, ref; + delay = ((ref = arguments[arguments.length - 2]) != null ? ref.delay : void 0) * 1000 || 1; elem.className += " animate"; elem.style.opacity = 0; setTimeout((function() { @@ -1339,8 +1346,8 @@ function clone(obj) { }; Animation.prototype.hide = function(elem, remove_func, props) { - var delay, _ref; - delay = ((_ref = arguments[arguments.length - 2]) != null ? _ref.delay : void 0) * 1000 || 1; + var delay, ref; + delay = ((ref = arguments[arguments.length - 2]) != null ? ref.delay : void 0) * 1000 || 1; elem.className += " animate"; setTimeout((function() { return elem.style.opacity = 0; @@ -1413,37 +1420,57 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/Autosize.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/Autosize.coffee ---- */ (function() { var Autosize, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; - - Autosize = (function(_super) { - __extends(Autosize, _super); - - function Autosize(_at_attrs) { - var _base; - this.attrs = _at_attrs != null ? _at_attrs : {}; - this.render = __bind(this.render, this); - this.handleKeydown = __bind(this.handleKeydown, this); - this.handleInput = __bind(this.handleInput, this); - this.autoHeight = __bind(this.autoHeight, this); - this.setValue = __bind(this.setValue, this); - this.storeNode = __bind(this.storeNode, this); + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; + + Autosize = (function(superClass) { + extend(Autosize, superClass); + + function Autosize(attrs1) { + var base, base1, base2, base3, base4, base5, base6, base7, base8; + this.attrs = attrs1 != null ? attrs1 : {}; + this.render = bind(this.render, this); + this.submit = bind(this.submit, this); + this.handleKeydown = bind(this.handleKeydown, this); + this.handleInput = bind(this.handleInput, this); + this.autoHeight = bind(this.autoHeight, this); + this.setValue = bind(this.setValue, this); + this.storeNode = bind(this.storeNode, this); this.node = null; - if ((_base = this.attrs).classes == null) { - _base.classes = {}; - } - this.attrs.classes.loading = false; - this.attrs.oninput = this.handleInput; - this.attrs.onkeydown = this.handleKeydown; - this.attrs.afterCreate = this.storeNode; - this.attrs.rows = 1; - this.attrs.disabled = false; + if ((base = this.attrs).classes == null) { + base.classes = {}; + } + if ((base1 = this.attrs.classes).loading == null) { + base1.loading = false; + } + if ((base2 = this.attrs).oninput == null) { + base2.oninput = this.handleInput; + } + if ((base3 = this.attrs).onkeydown == null) { + base3.onkeydown = this.handleKeydown; + } + if ((base4 = this.attrs).afterCreate == null) { + base4.afterCreate = this.storeNode; + } + if ((base5 = this.attrs).rows == null) { + base5.rows = 1; + } + if ((base6 = this.attrs).disabled == null) { + base6.disabled = false; + } + if ((base7 = this.attrs).value == null) { + base7.value = ""; + } + if ((base8 = this.attrs).title_submit == null) { + base8.title_submit = null; + } } Autosize.property('loading', { @@ -1514,32 +1541,43 @@ function clone(obj) { if (e == null) { e = null; } - if (e.which === 13 && !e.shiftKey && this.attrs.onsubmit && this.attrs.value.trim()) { - this.attrs.onsubmit(); - setTimeout(((function(_this) { - return function() { - return _this.autoHeight(); - }; - })(this)), 100); - return false; + if (e.which === 13 && e.ctrlKey && this.attrs.onsubmit && this.attrs.value.trim()) { + return this.submit(); } }; + Autosize.prototype.submit = function() { + this.attrs.onsubmit(); + setTimeout(((function(_this) { + return function() { + return _this.autoHeight(); + }; + })(this)), 100); + return false; + }; + Autosize.prototype.render = function(body) { - var attrs; + var attrs, tag_textarea; if (body == null) { body = null; } - if (body && this.attrs.value === void 0) { + if (body && !this.attrs.value) { this.setValue(body); } if (this.loading) { attrs = clone(this.attrs); attrs.disabled = true; - return h("textarea.autosize", attrs); + tag_textarea = h("textarea.autosize", attrs); } else { - return h("textarea.autosize", this.attrs); + tag_textarea = h("textarea.autosize", this.attrs); } + return [ + tag_textarea, this.attrs.title_submit ? h("a.button.button.button-submit.button-small", { + href: "#Submit", + onclick: this.submit, + classes: this.attrs.classes + }, this.attrs.title_submit) : void 0 + ]; }; return Autosize; @@ -1551,7 +1589,8 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/Debug.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/Debug.coffee ---- */ (function() { @@ -1584,28 +1623,29 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/Editable.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/Editable.coffee ---- */ (function() { var Editable, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; - - Editable = (function(_super) { - __extends(Editable, _super); - - function Editable(_at_type, _at_handleSave, _at_handleDelete) { - this.type = _at_type; - this.handleSave = _at_handleSave; - this.handleDelete = _at_handleDelete; - this.render = __bind(this.render, this); - this.handleSaveClick = __bind(this.handleSaveClick, this); - this.handleDeleteClick = __bind(this.handleDeleteClick, this); - this.handleCancelClick = __bind(this.handleCancelClick, this); - this.handleEditClick = __bind(this.handleEditClick, this); - this.storeNode = __bind(this.storeNode, this); + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; + + Editable = (function(superClass) { + extend(Editable, superClass); + + function Editable(type, handleSave, handleDelete) { + this.type = type; + this.handleSave = handleSave; + this.handleDelete = handleDelete; + this.render = bind(this.render, this); + this.handleSaveClick = bind(this.handleSaveClick, this); + this.handleDeleteClick = bind(this.handleDeleteClick, this); + this.handleCancelClick = bind(this.handleCancelClick, this); + this.handleEditClick = bind(this.handleEditClick, this); + this.storeNode = bind(this.storeNode, this); this.node = null; this.editing = false; this.render_function = null; @@ -1695,20 +1735,21 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/ImagePreview.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/ImagePreview.coffee ---- */ (function() { var ImagePreview, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; - ImagePreview = (function(_super) { - __extends(ImagePreview, _super); + ImagePreview = (function(superClass) { + extend(ImagePreview, superClass); function ImagePreview() { - this.setPreviewData = __bind(this.setPreviewData, this); + this.setPreviewData = bind(this.setPreviewData, this); this.width = 0; this.height = 0; this.preview_data = ""; @@ -1730,14 +1771,14 @@ function clone(obj) { return [Math.round(width), Math.round(height)]; }; - ImagePreview.prototype.setPreviewData = function(_at_preview_data) { - var colors, pixels, _ref; - this.preview_data = _at_preview_data; - return _ref = this.preview_data.split(","), this.width = _ref[0], this.height = _ref[1], colors = _ref[2], pixels = _ref[3], _ref; + ImagePreview.prototype.setPreviewData = function(preview_data) { + var colors, pixels, ref; + this.preview_data = preview_data; + return ref = this.preview_data.split(","), this.width = ref[0], this.height = ref[1], colors = ref[2], pixels = ref[3], ref; }; ImagePreview.prototype.getPreviewUri = function(target_width, target_height) { - var b, back, canvas, color, color_codes, colors, ctx, di, g, height, hex, i, image_data, pixel, pixels, r, width, _i, _j, _len, _len1, _ref, _ref1; + var b, back, canvas, canvas2, color, color_codes, colors, ctx, di, g, height, hex, i, image_data, j, k, len, len1, pixel, pixels, r, ref, ref1, width; if (target_width == null) { target_width = 10; } @@ -1745,8 +1786,8 @@ function clone(obj) { target_height = 10; } this.logStart("Render"); - _ref = this.preview_data.split(","), this.width = _ref[0], this.height = _ref[1], colors = _ref[2], pixels = _ref[3]; - _ref1 = this.getSize(target_width, target_height), width = _ref1[0], height = _ref1[1]; + ref = this.preview_data.split(","), this.width = ref[0], this.height = ref[1], colors = ref[2], pixels = ref[3]; + ref1 = this.getSize(target_width, target_height), width = ref1[0], height = ref1[1]; colors = colors.match(/.{3}/g); pixels = pixels.split(""); canvas = document.createElement("canvas"); @@ -1755,13 +1796,13 @@ function clone(obj) { ctx = canvas.getContext('2d'); image_data = ctx.createImageData(width, height); color_codes = {}; - for (i = _i = 0, _len = colors.length; _i < _len; i = ++_i) { + for (i = j = 0, len = colors.length; j < len; i = ++j) { color = colors[i]; color_codes[this.pixel_chars[i]] = color; } di = 0; - for (_j = 0, _len1 = pixels.length; _j < _len1; _j++) { - pixel = pixels[_j]; + for (k = 0, len1 = pixels.length; k < len1; k++) { + pixel = pixels[k]; hex = color_codes[pixel]; r = parseInt(hex[0], 16) * 17; g = parseInt(hex[1], 16) * 17; @@ -1773,18 +1814,14 @@ function clone(obj) { di += 4; } ctx.putImageData(image_data, 0, 0); - - /* - canvas2 = document.createElement("canvas") - canvas2.width = width*3 - canvas2.height = height*3 - ctx = canvas2.getContext('2d') - ctx.filter = "blur(1px)" - ctx.drawImage(canvas, 1, 0, canvas.width*3, canvas.height*3) - ctx.drawImage(canvas, 0, 1, canvas.width*3, canvas.height*3) - ctx.drawImage(canvas, 0, 0, canvas.width*3, canvas.height*3) - */ - back = canvas.toDataURL("image/png"); + canvas2 = document.createElement("canvas"); + canvas2.width = width * 3; + canvas2.height = height * 3; + ctx = canvas2.getContext('2d'); + ctx.filter = "blur(1px)"; + ctx.drawImage(canvas, -5, -5, canvas.width * 3 + 10, canvas.height * 3 + 10); + ctx.drawImage(canvas, 0, 0, canvas.width * 3, canvas.height * 3); + back = canvas2.toDataURL("image/png"); this.logEnd("Render"); return back; }; @@ -1798,37 +1835,38 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/ItemList.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/ItemList.coffee ---- */ (function() { var ItemList; ItemList = (function() { - function ItemList(_at_item_class, _at_key) { - this.item_class = _at_item_class; - this.key = _at_key; + function ItemList(item_class1, key1) { + this.item_class = item_class1; + this.key = key1; this.items = []; this.items_bykey = {}; } ItemList.prototype.sync = function(rows, item_class, key) { - var current_obj, item, row, _i, _len, _results; + var current_obj, i, item, len, results, row; this.items.splice(0, this.items.length); - _results = []; - for (_i = 0, _len = rows.length; _i < _len; _i++) { - row = rows[_i]; + results = []; + for (i = 0, len = rows.length; i < len; i++) { + row = rows[i]; current_obj = this.items_bykey[row[this.key]]; if (current_obj) { current_obj.row = row; - _results.push(this.items.push(current_obj)); + results.push(this.items.push(current_obj)); } else { item = new this.item_class(row, this); this.items_bykey[row[this.key]] = item; - _results.push(this.items.push(item)); + results.push(this.items.push(item)); } } - return _results; + return results; }; ItemList.prototype.deleteItem = function(item) { @@ -1851,7 +1889,8 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/Maxheight.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/Maxheight.coffee ---- */ (function() { @@ -1887,31 +1926,32 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/Menu.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/Menu.coffee ---- */ (function() { var Menu, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }; Menu = (function() { function Menu() { - this.render = __bind(this.render, this); - this.renderItem = __bind(this.renderItem, this); - this.handleClick = __bind(this.handleClick, this); - this.storeNode = __bind(this.storeNode, this); - this.toggle = __bind(this.toggle, this); - this.hide = __bind(this.hide, this); - this.show = __bind(this.show, this); + this.render = bind(this.render, this); + this.renderItem = bind(this.renderItem, this); + this.handleClick = bind(this.handleClick, this); + this.storeNode = bind(this.storeNode, this); + this.toggle = bind(this.toggle, this); + this.hide = bind(this.hide, this); + this.show = bind(this.show, this); this.visible = false; this.items = []; this.node = null; } Menu.prototype.show = function() { - var _ref; - if ((_ref = window.visible_menu) != null) { - _ref.hide(); + var ref; + if ((ref = window.visible_menu) != null) { + ref.hide(); } this.visible = true; return window.visible_menu = this; @@ -1948,17 +1988,21 @@ function clone(obj) { }; Menu.prototype.handleClick = function(e) { - var cb, item, keep_menu, selected, title, _i, _len, _ref; + var cb, i, item, keep_menu, len, ref, selected, title; keep_menu = false; - _ref = this.items; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - item = _ref[_i]; + ref = this.items; + for (i = 0, len = ref.length; i < len; i++) { + item = ref[i]; title = item[0], cb = item[1], selected = item[2]; if (title === e.target.textContent) { keep_menu = cb(item); } } - if (keep_menu !== true) { + if (e.target.type && (e.target.type === "everyone" || e.target.type === "lang" || e.target.type.slice(0, 3) === "hub")) { + this.hide(); + } else if (e.target.value || e.target.title === "") { + this.show(); + } else if (keep_menu !== true) { this.hide(); } return false; @@ -1980,14 +2024,34 @@ function clone(obj) { href = "#" + title; onclick = this.handleClick; } - return h("a.menu-item", { - href: href, - onclick: onclick, - key: title, - classes: { - "selected": selected - } - }, [title]); + if (title === "Show posts after") { + return h("div.show-after", h("a.menu-item", { + href: href, + onclick: onclick, + key: title + }, [title]), h("input#show-after-date", { + placeholder: "unix time", + value: selected + })); + } else if (title === "Show posts since") { + return h("div.show-since", h("a.menu-item", { + href: href, + onclick: onclick, + key: title + }, [title]), h("input#show-since-day", { + placeholder: " n ", + value: selected + }), " days ago"); + } else { + return h("a.menu-item", { + href: href, + onclick: onclick, + key: title, + classes: { + "selected": selected + } + }, [title]); + } } }; @@ -2015,7 +2079,7 @@ function clone(obj) { if (!window.visible_menu || !window.visible_menu.node) { return false; } - if (e.target !== window.visible_menu.node.parentNode && e.target.parentNode !== window.visible_menu.node && e.target.parentNode !== window.visible_menu.node.parentNode && e.target.parentNode !== window.visible_menu.node && e.target.parentNode.parentNode !== window.visible_menu.node.parentNode) { + if (e.target !== window.visible_menu.node.parentNode && e.target.parentNode !== window.visible_menu.node && e.target.parentNode !== window.visible_menu.node.parentNode && e.target.parentNode !== window.visible_menu.node && e.target.parentNode.parentNode !== window.visible_menu.node && e.target.parentNode.parentNode !== window.visible_menu.node.parentNode) { window.visible_menu.hide(); return Page.projector.scheduleRender(); } @@ -2024,22 +2088,23 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/Overlay.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/Overlay.coffee ---- */ (function() { var Overlay, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; - Overlay = (function(_super) { - __extends(Overlay, _super); + Overlay = (function(superClass) { + extend(Overlay, superClass); function Overlay() { - this.render = __bind(this.render, this); - this.handleClick = __bind(this.handleClick, this); - this.zoomImageTag = __bind(this.zoomImageTag, this); + this.render = bind(this.render, this); + this.handleClick = bind(this.handleClick, this); + this.zoomImageTag = bind(this.zoomImageTag, this); this.visible = false; this.called = false; this.height = 0; @@ -2142,20 +2207,21 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/Scrollwatcher.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/Scrollwatcher.coffee ---- */ (function() { var Scrollwatcher, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; - Scrollwatcher = (function(_super) { - __extends(Scrollwatcher, _super); + Scrollwatcher = (function(superClass) { + extend(Scrollwatcher, superClass); function Scrollwatcher() { - this.checkScroll = __bind(this.checkScroll, this); + this.checkScroll = bind(this.checkScroll, this); this.log("Scrollwatcher"); this.items = []; window.onscroll = (function(_this) { @@ -2167,24 +2233,24 @@ function clone(obj) { } Scrollwatcher.prototype.checkScroll = function() { - var cb, i, item_top, tag, view_bottom, view_top, _i, _ref, _ref1, _results; + var cb, i, item_top, j, ref, ref1, results, tag, view_bottom, view_top; if (!this.items.length) { return; } view_top = window.scrollY; view_bottom = window.scrollY + window.innerHeight; - _ref = this.items; - _results = []; - for (i = _i = _ref.length - 1; _i >= 0; i = _i += -1) { - _ref1 = _ref[i], item_top = _ref1[0], tag = _ref1[1], cb = _ref1[2]; + ref = this.items; + results = []; + for (i = j = ref.length - 1; j >= 0; i = j += -1) { + ref1 = ref[i], item_top = ref1[0], tag = ref1[1], cb = ref1[2]; if (item_top + 900 > view_top && item_top - 400 < view_bottom) { this.items.splice(i, 1); - _results.push(cb(tag)); + results.push(cb(tag)); } else { - _results.push(void 0); + results.push(void 0); } } - return _results; + return results; }; Scrollwatcher.prototype.add = function(tag, cb) { @@ -2201,18 +2267,19 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/Text.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/Text.coffee ---- */ (function() { var MarkedRenderer, Text, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty, + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; - MarkedRenderer = (function(_super) { - __extends(MarkedRenderer, _super); + MarkedRenderer = (function(superClass) { + extend(MarkedRenderer, superClass); function MarkedRenderer() { return MarkedRenderer.__super__.constructor.apply(this, arguments); @@ -2228,12 +2295,12 @@ function clone(obj) { Text = (function() { function Text() { - this.renderLinks = __bind(this.renderLinks, this); - this.renderMarked = __bind(this.renderMarked, this); + this.renderLinks = bind(this.renderLinks, this); + this.renderMarked = bind(this.renderMarked, this); } Text.prototype.toColor = function(text, saturation, lightness) { - var hash, i, _i, _ref; + var hash, i, j, ref, ref1, ref2; if (saturation == null) { saturation = 30; } @@ -2241,11 +2308,15 @@ function clone(obj) { lightness = 50; } hash = 0; - for (i = _i = 0, _ref = text.length - 1; 0 <= _ref ? _i <= _ref : _i >= _ref; i = 0 <= _ref ? ++_i : --_i) { + for (i = j = 0, ref = text.length - 1; 0 <= ref ? j <= ref : j >= ref; i = 0 <= ref ? ++j : --j) { hash += text.charCodeAt(i) * i; hash = hash % 1777; } - return "hsl(" + (hash % 360) + ("," + saturation + "%," + lightness + "%)"); + if (((ref1 = Page.server_info) != null ? (ref2 = ref1.user_settings) != null ? ref2.theme : void 0 : void 0) === "dark") { + return "hsl(" + (hash % 360) + ("," + (saturation + 5) + "%," + (lightness + 15) + "%)"); + } else { + return "hsl(" + (hash % 360) + ("," + saturation + "%," + lightness + "%)"); + } }; Text.prototype.renderMarked = function(text, options) { @@ -2261,7 +2332,8 @@ function clone(obj) { options["renderer"] = marked_renderer; text = this.fixReply(text); text = marked(text, options); - text = text.replace(/(@[^\x00-\x1f^\x21-\x2f^\x3a-\x40^\x5b-\x60^\x7b-\x7f]{1,16}):/g, '$1:'); + text = text.replace(/(.*?)<\/a>/g, '$1'); + text = text.replace(/(\s|>|^)(@[^\s]{1,50}):/g, '$1$2:'); return this.fixHtmlLinks(text); }; @@ -2271,7 +2343,7 @@ function clone(obj) { return "" + match + ""; }); text = text.replace(/\n/g, '
'); - text = text.replace(/(@[^\x00-\x1f^\x21-\x2f^\x3a-\x40^\x5b-\x60^\x7b-\x7f]{1,16}):/g, '$1:'); + text = text.replace(/(\s|>|^)(@[^\s]{1,50}):/g, '$1$2:'); text = this.fixHtmlLinks(text); return text; }; @@ -2285,6 +2357,7 @@ function clone(obj) { if (window.is_proxy) { text = text.replace(/href="http:\/\/(127.0.0.1|localhost):43110/gi, 'href="http://zero'); text = text.replace(/http:\/\/zero\/([^\/]+\.bit)/, "http://$1"); + text = text.replace(/href="\/([A-Za-z0-9]{26,35})/g, 'href="http://zero/$1'); } else { text = text.replace(/href="http:\/\/(127.0.0.1|localhost):43110/g, 'href="'); } @@ -2296,7 +2369,9 @@ function clone(obj) { var back; if (window.is_proxy) { back = link.replace(/http:\/\/(127.0.0.1|localhost):43110/, 'http://zero'); - return back.replace(/http:\/\/zero\/([^\/]+\.bit)/, "http://$1"); + back = back.replace(/http:\/\/zero\/([^\/]+\.bit)/, "http://$1"); + back = back.replace(/\/([A-Za-z0-9]{26,35})/, "http://zero/$1"); + return back; } else { return link.replace(/http:\/\/(127.0.0.1|localhost):43110/, ''); } @@ -2308,7 +2383,7 @@ function clone(obj) { Text.prototype.getSiteUrl = function(address) { if (window.is_proxy) { - if (__indexOf.call(address, ".") >= 0) { + if (indexOf.call(address, ".") >= 0) { return "http://" + address + "/"; } else { return "http://zero/" + address + "/"; @@ -2351,15 +2426,15 @@ function clone(obj) { }; Text.prototype.distance = function(s1, s2) { - var char, extra_parts, key, match, next_find, next_find_i, val, _i, _len; + var char, extra_parts, j, key, len, match, next_find, next_find_i, val; s1 = s1.toLocaleLowerCase(); s2 = s2.toLocaleLowerCase(); next_find_i = 0; next_find = s2[0]; match = true; extra_parts = {}; - for (_i = 0, _len = s1.length; _i < _len; _i++) { - char = s1[_i]; + for (j = 0, len = s1.length; j < len; j++) { + char = s1[j]; if (char !== next_find) { if (extra_parts[next_find_i]) { extra_parts[next_find_i] += char; @@ -2375,13 +2450,13 @@ function clone(obj) { extra_parts[next_find_i] = ""; } extra_parts = (function() { - var _results; - _results = []; + var results; + results = []; for (key in extra_parts) { val = extra_parts[key]; - _results.push(val); + results.push(val); } - return _results; + return results; })(); if (next_find_i >= s2.length) { return extra_parts.length + extra_parts.join("").length; @@ -2391,12 +2466,12 @@ function clone(obj) { }; Text.prototype.queryParse = function(query) { - var key, params, part, parts, val, _i, _len, _ref; + var j, key, len, params, part, parts, ref, val; params = {}; parts = query.split('&'); - for (_i = 0, _len = parts.length; _i < _len; _i++) { - part = parts[_i]; - _ref = part.split("="), key = _ref[0], val = _ref[1]; + for (j = 0, len = parts.length; j < len; j++) { + part = parts[j]; + ref = part.split("="), key = ref[0], val = ref[1]; if (val) { params[decodeURIComponent(key)] = decodeURIComponent(val); } else { @@ -2424,10 +2499,10 @@ function clone(obj) { }; Text.prototype.highlight = function(text, search) { - var back, i, part, parts, _i, _len; + var back, i, j, len, part, parts; parts = text.split(RegExp(search, "i")); back = []; - for (i = _i = 0, _len = parts.length; _i < _len; i = ++_i) { + for (i = j = 0, len = parts.length; j < len; i = ++j) { part = parts[i]; back.push(part); if (i < parts.length - 1) { @@ -2442,13 +2517,13 @@ function clone(obj) { Text.prototype.sqlIn = function(values) { var value; return "(" + ((function() { - var _i, _len, _results; - _results = []; - for (_i = 0, _len = values.length; _i < _len; _i++) { - value = values[_i]; - _results.push("'" + value + "'"); + var j, len, results; + results = []; + for (j = 0, len = values.length; j < len; j++) { + value = values[j]; + results.push("'" + value + "'"); } - return _results; + return results; })()).join(',') + ")"; }; @@ -2479,7 +2554,8 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/Time.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/Time.coffee ---- */ (function() { @@ -2547,7 +2623,8 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/Translate.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/Translate.coffee ---- */ (function() { @@ -2558,25 +2635,26 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/Uploadable.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/Uploadable.coffee ---- */ (function() { var Uploadable, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; - - Uploadable = (function(_super) { - __extends(Uploadable, _super); - - function Uploadable(_at_handleSave) { - this.handleSave = _at_handleSave; - this.getPixelData = __bind(this.getPixelData, this); - this.render = __bind(this.render, this); - this.handleUploadClick = __bind(this.handleUploadClick, this); - this.resizeImage = __bind(this.resizeImage, this); - this.storeNode = __bind(this.storeNode, this); + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; + + Uploadable = (function(superClass) { + extend(Uploadable, superClass); + + function Uploadable(handleSave) { + this.handleSave = handleSave; + this.getPixelData = bind(this.getPixelData, this); + this.render = bind(this.render, this); + this.handleUploadClick = bind(this.handleUploadClick, this); + this.resizeImage = bind(this.resizeImage, this); + this.storeNode = bind(this.storeNode, this); this.node = null; this.resize_width = 50; this.resize_height = 50; @@ -2607,11 +2685,11 @@ function clone(obj) { image = new Image(); image.onload = (function(_this) { return function() { - var canvas, canvas_quant, ctx, image_base64uri, optimizer, quant, _ref; + var canvas, canvas_quant, ctx, image_base64uri, optimizer, quant, ref; _this.log("Resize image loaded"); canvas = document.createElement("canvas"); if (_this.preverse_ratio) { - _ref = _this.image_preview.calcSize(image.width, image.height, width, height), canvas.width = _ref[0], canvas.height = _ref[1]; + ref = _this.image_preview.calcSize(image.width, image.height, width, height), canvas.width = ref[0], canvas.height = ref[1]; } else { canvas.width = width; canvas.height = height; @@ -2695,12 +2773,12 @@ function clone(obj) { }; Uploadable.prototype.getPixelData = function(data) { - var b, color_db, colors, colors_next_id, g, hex, i, pixels, r, _i, _ref; + var b, color_db, colors, colors_next_id, g, hex, i, j, pixels, r, ref; color_db = {}; colors = []; colors_next_id = 0; pixels = []; - for (i = _i = 0, _ref = data.length - 1; _i <= _ref; i = _i += 4) { + for (i = j = 0, ref = data.length - 1; j <= ref; i = j += 4) { r = data[i]; g = data[i + 1]; b = data[i + 2]; @@ -2727,11 +2805,11 @@ function clone(obj) { image.src = image_base64uri; return image.onload = (function(_this) { return function() { - var back, canvas, ctx, image_data, image_height, image_width, pixeldata, quant, _ref; + var back, canvas, ctx, image_data, image_height, image_width, pixeldata, quant, ref; image_width = image.width; image_height = image.height; canvas = document.createElement("canvas"); - _ref = _this.image_preview.calcSize(image.width, image.height, target_width, target_height), canvas.width = _ref[0], canvas.height = _ref[1]; + ref = _this.image_preview.calcSize(image.width, image.height, target_width, target_height), canvas.width = ref[0], canvas.height = ref[1]; ctx = canvas.getContext("2d"); ctx.fillStyle = "#FFF"; ctx.fillRect(0, 0, canvas.width, canvas.height); @@ -2765,23 +2843,24 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/utils/ZeroFrame.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/utils/ZeroFrame.coffee ---- */ (function() { var ZeroFrame, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; - ZeroFrame = (function(_super) { - __extends(ZeroFrame, _super); + ZeroFrame = (function(superClass) { + extend(ZeroFrame, superClass); function ZeroFrame(url) { - this.onCloseWebsocket = __bind(this.onCloseWebsocket, this); - this.onOpenWebsocket = __bind(this.onOpenWebsocket, this); - this.onRequest = __bind(this.onRequest, this); - this.onMessage = __bind(this.onMessage, this); + this.onCloseWebsocket = bind(this.onCloseWebsocket, this); + this.onOpenWebsocket = bind(this.onOpenWebsocket, this); + this.onRequest = bind(this.onRequest, this); + this.onMessage = bind(this.onMessage, this); this.url = url; this.waiting_cb = {}; this.history_state = {}; @@ -2919,23 +2998,24 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/ActivityList.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/ActivityList.coffee ---- */ (function() { var ActivityList, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty, - __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty, + indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; - ActivityList = (function(_super) { - __extends(ActivityList, _super); + ActivityList = (function(superClass) { + extend(ActivityList, superClass); function ActivityList() { - this.update = __bind(this.update, this); - this.render = __bind(this.render, this); - this.handleMoreClick = __bind(this.handleMoreClick, this); + this.update = bind(this.update, this); + this.render = bind(this.render, this); + this.handleMoreClick = bind(this.handleMoreClick, this); this.activities = null; this.directories = []; this.need_update = true; @@ -2943,20 +3023,48 @@ function clone(obj) { this.found = 0; this.loading = true; this.update_timer = null; + this.filter_hub = null; + this.filter_language_ids = null; + this.show_after_date = "0"; + this.show_since_day = "0"; } ActivityList.prototype.queryActivities = function(cb) { var query, where; - if (this.directories === "all") { - where = "WHERE date_added > " + (Time.timestamp() - 60 * 60 * 24 * 2) + " AND date_added < " + (Time.timestamp() + 120) + " "; + if (this.filter_language_ids) { + where = "WHERE (comment_id, json_id) IN " + this.filter_language_ids + " AND date_added < " + (Time.timestamp() + 120) + " "; + } else if (this.directories === "all") { + if ((Page.local_storage.settings.show_since || Page.local_storage.settings.show_after) && Page.local_storage.settings.show_since !== "0") { + where = "WHERE date_added < " + (Time.timestamp() + 120) + " "; + } else { + where = "WHERE date_added > " + (Time.timestamp() - 60 * 60 * 24 * 2) + " AND date_added < " + (Time.timestamp() + 120) + " "; + } + } else if (this.directories === "hub") { + where = "WHERE json.hub = '" + this.filter_hub + "' AND date_added < " + (Time.timestamp() + 120) + " "; } else { where = "WHERE json.directory IN " + (Text.sqlIn(this.directories)) + " AND date_added < " + (Time.timestamp() + 120) + " "; } - query = "SELECT\n 'comment' AS type, json.*,\n json.site || \"/\" || post_uri AS subject, body, date_added,\n NULL AS subject_auth_address, NULL AS subject_hub, NULL AS subject_user_name\nFROM\n json\nLEFT JOIN comment USING (json_id)\n " + where + "\n\nUNION ALL\n\nSELECT\n 'post_like' AS type, json.*,\n json.site || \"/\" || post_uri AS subject, '' AS body, date_added,\n NULL AS subject_auth_address, NULL AS subject_hub, NULL AS subject_user_name\nFROM\n json\nLEFT JOIN post_like USING (json_id)\n " + where; + if (Page.local_storage.settings.show_since) { + if (Page.local_storage.settings.show_since !== "0") { + this.show_since_day = Page.local_storage.settings.show_since; + where += "AND date_added > strftime('%s', 'now') - 3600*24*" + String(this.show_since_day) + " "; + } + } else if (Page.local_storage.settings.show_after) { + this.show_after_date = Page.local_storage.settings.show_after - 1; + where += "AND date_added > " + String(this.show_after_date) + " "; + } + query = "SELECT\n 'comment' AS type, json.*,\n json.site || \"/\" || post_uri AS subject, body, date_added,\n NULL AS subject_auth_address, NULL AS subject_hub, NULL AS subject_user_name\nFROM\n comment\nLEFT JOIN json USING (json_id)\n " + where; + if (!this.filter_language_ids) { + query += "\nUNION ALL\n\nSELECT\n 'post_like' AS type, json.*,\n json.site || \"/\" || post_uri AS subject, '' AS body, date_added,\n NULL AS subject_auth_address, NULL AS subject_hub, NULL AS subject_user_name\nFROM\n json\nLEFT JOIN post_like USING (json_id)\n " + where; + } if (this.directories !== "all") { query += "UNION ALL\n\nSELECT\n 'follow' AS type, json.*,\n follow.hub || \"/\" || follow.auth_address AS subject, '' AS body, date_added,\n follow.auth_address AS subject_auth_address, follow.hub AS subject_hub, follow.user_name AS subject_user_name\nFROM\n json\nLEFT JOIN follow USING (json_id)\n " + where; } - query += "\nORDER BY date_added DESC\nLIMIT " + (this.limit + 1); + if ((Page.local_storage.settings.show_since || Page.local_storage.settings.show_after) && Page.local_storage.settings.show_since !== "0") { + query += "\nORDER BY date_added ASC\nLIMIT " + (this.limit + 1); + } else { + query += "\nORDER BY date_added DESC\nLIMIT " + (this.limit + 1); + } this.logStart("Update"); return Page.cmd("dbQuery", [ query, { @@ -2964,27 +3072,27 @@ function clone(obj) { } ], (function(_this) { return function(rows) { - var directories, directory, row, subject_address, _i, _len; + var directories, directory, i, len, row, subject_address; directories = []; rows = (function() { - var _i, _len, _results; - _results = []; - for (_i = 0, _len = rows.length; _i < _len; _i++) { - row = rows[_i]; + var i, len, results; + results = []; + for (i = 0, len = rows.length; i < len; i++) { + row = rows[i]; if (row.subject) { - _results.push(row); + results.push(row); } } - return _results; + return results; })(); - for (_i = 0, _len = rows.length; _i < _len; _i++) { - row = rows[_i]; + for (i = 0, len = rows.length; i < len; i++) { + row = rows[i]; row.auth_address = row.directory.replace("data/users/", ""); subject_address = row.subject.replace(/_.*/, "").replace(/.*\//, ""); row.post_id = row.subject.replace(/.*_/, "").replace(/.*\//, ""); row.subject_address = subject_address; directory = "data/users/" + subject_address; - if (__indexOf.call(directories, directory) < 0) { + if (indexOf.call(directories, directory) < 0) { directories.push(directory); } } @@ -2993,35 +3101,35 @@ function clone(obj) { directory: directories } ], function(subject_rows) { - var last_row, row_group, row_groups, subject_db, subject_row, _base, _base1, _base2, _j, _k, _l, _len1, _len2, _len3, _ref; + var base, base1, base2, j, k, l, last_row, len1, len2, len3, ref, row_group, row_groups, subject_db, subject_row; subject_db = {}; - for (_j = 0, _len1 = subject_rows.length; _j < _len1; _j++) { - subject_row = subject_rows[_j]; + for (j = 0, len1 = subject_rows.length; j < len1; j++) { + subject_row = subject_rows[j]; subject_row.auth_address = subject_row.directory.replace("data/users/", ""); subject_db[subject_row.auth_address] = subject_row; } - for (_k = 0, _len2 = rows.length; _k < _len2; _k++) { - row = rows[_k]; + for (k = 0, len2 = rows.length; k < len2; k++) { + row = rows[k]; row.subject = subject_db[row.subject_address]; if (row.subject == null) { row.subject = {}; } - if ((_base = row.subject).auth_address == null) { - _base.auth_address = row.subject_auth_address; + if ((base = row.subject).auth_address == null) { + base.auth_address = row.subject_auth_address; } - if ((_base1 = row.subject).hub == null) { - _base1.hub = row.subject_hub; + if ((base1 = row.subject).hub == null) { + base1.hub = row.subject_hub; } - if ((_base2 = row.subject).user_name == null) { - _base2.user_name = row.subject_user_name; + if ((base2 = row.subject).user_name == null) { + base2.user_name = row.subject_user_name; } } last_row = null; row_group = []; row_groups = []; - for (_l = 0, _len3 = rows.length; _l < _len3; _l++) { - row = rows[_l]; - if (!last_row || (row.auth_address === (last_row != null ? last_row.auth_address : void 0) && row.type === (last_row != null ? last_row.type : void 0) && ((_ref = row.type) === "post_like" || _ref === "follow"))) { + for (l = 0, len3 = rows.length; l < len3; l++) { + row = rows[l]; + if (!last_row || (row.auth_address === (last_row != null ? last_row.auth_address : void 0) && row.type === (last_row != null ? last_row.type : void 0) && ((ref = row.type) === "post_like" || ref === "follow"))) { row_group.push(row); } else { row_groups.push(row_group); @@ -3047,7 +3155,7 @@ function clone(obj) { }; ActivityList.prototype.renderActivity = function(activity_group) { - var activity, activity_more, activity_user_link, back, body, now, subject_post_link, subject_user_link, title, _i, _j, _len, _len1, _ref, _ref1; + var activity, activity_more, activity_user_link, back, body, i, j, len, len1, now, ref, ref1, subject_post_link, subject_user_link, title; back = []; now = Time.timestamp(); activity = activity_group[0]; @@ -3071,9 +3179,9 @@ function clone(obj) { }, _("post", "like post")) ]; if (activity_group.length > 1) { - _ref = activity_group.slice(1, 11); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - activity_more = _ref[_i]; + ref = activity_group.slice(1, 11); + for (i = 0, len = ref.length; i < len; i++) { + activity_more = ref[i]; subject_user_link = "?Profile/" + activity_more.subject.hub + "/" + activity_more.subject.auth_address + "/" + (activity_more.subject.cert_user_id || ''); subject_post_link = "?Post/" + activity_more.subject.hub + "/" + activity_more.subject.auth_address + "/" + activity_more.post_id; body.push(", "); @@ -3099,7 +3207,7 @@ function clone(obj) { }, activity.subject.user_name), "'s ", h("a.link", { href: subject_post_link, onclick: this.Page.handleLinkClick - }, _("post", "comment post")), ": " + activity.body + }, _("post", "comment post")), ": " + activity.body.slice(0, 101) ]; } else if (activity.type === "follow") { body = [ @@ -3112,9 +3220,9 @@ function clone(obj) { }, activity.subject.user_name) ]; if (activity_group.length > 1) { - _ref1 = activity_group.slice(1, 11); - for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { - activity_more = _ref1[_j]; + ref1 = activity_group.slice(1, 11); + for (j = 0, len1 = ref1.length; j < len1; j++) { + activity_more = ref1[j]; subject_user_link = "?Profile/" + activity_more.subject.hub + "/" + activity_more.subject.auth_address + "/" + (activity_more.subject.cert_user_id || ''); body.push(", "); body.push(h("a.link", { @@ -3193,21 +3301,22 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/AnonUser.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/AnonUser.coffee ---- */ (function() { var AnonUser, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; - AnonUser = (function(_super) { - __extends(AnonUser, _super); + AnonUser = (function(superClass) { + extend(AnonUser, superClass); function AnonUser() { - this.save = __bind(this.save, this); - this.updateInfo = __bind(this.updateInfo, this); + this.save = bind(this.save, this); + this.updateInfo = bind(this.updateInfo, this); this.auth_address = null; this.hub = null; this.followed_users = {}; @@ -3285,27 +3394,29 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/ContentCreateProfile.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/ContentCreateProfile.coffee ---- */ (function() { var ContentCreateProfile, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; - ContentCreateProfile = (function(_super) { - __extends(ContentCreateProfile, _super); + ContentCreateProfile = (function(superClass) { + extend(ContentCreateProfile, superClass); function ContentCreateProfile() { - this.update = __bind(this.update, this); - this.render = __bind(this.render, this); - this.renderDefaultHubs = __bind(this.renderDefaultHubs, this); - this.renderSeededHubs = __bind(this.renderSeededHubs, this); - this.renderHub = __bind(this.renderHub, this); - this.updateHubs = __bind(this.updateHubs, this); - this.handleJoinClick = __bind(this.handleJoinClick, this); - this.handleDownloadClick = __bind(this.handleDownloadClick, this); + this.update = bind(this.update, this); + this.render = bind(this.render, this); + this.renderDefaultHubs = bind(this.renderDefaultHubs, this); + this.renderSeededHubs = bind(this.renderSeededHubs, this); + this.renderHub = bind(this.renderHub, this); + this.updateHubs = bind(this.updateHubs, this); + this.joinHub = bind(this.joinHub, this); + this.handleJoinClick = bind(this.handleJoinClick, this); + this.handleDownloadClick = bind(this.handleDownloadClick, this); this.loaded = true; this.hubs = []; this.default_hubs = []; @@ -3327,8 +3438,36 @@ function clone(obj) { }; ContentCreateProfile.prototype.handleJoinClick = function(e) { - var hub, user; - hub = e.target.attributes.address.value; + var hub, hub_address, hub_name, ref, ref1; + hub_address = e.target.attributes.address.value; + if ((ref = Page.user) != null ? ref.hub : void 0) { + hub_name = (ref1 = (function() { + var i, len, ref2, results; + ref2 = this.hubs; + results = []; + for (i = 0, len = ref2.length; i < len; i++) { + hub = ref2[i]; + if (hub.address === Page.user.hub) { + results.push(hub.content.title); + } + } + return results; + }).call(this)) != null ? ref1[0] : void 0; + if (hub_name == null) { + hub_name = Page.user.hub; + } + return Page.cmd("wrapperConfirm", ["You already have profile on hub " + hub_name + ",
are you sure you want to create a new one?", "Create new profile"], (function(_this) { + return function() { + return _this.joinHub(hub_address); + }; + })(this)); + } else { + return this.joinHub(hub_address); + } + }; + + ContentCreateProfile.prototype.joinHub = function(hub) { + var user; user = new User({ hub: hub, auth_address: Page.site_info.auth_address @@ -3364,14 +3503,14 @@ function clone(obj) { ContentCreateProfile.prototype.updateHubs = function() { return Page.cmd("mergerSiteList", true, (function(_this) { return function(sites) { - var address, content, _ref, _results; + var address, content, ref, results; Page.cmd("dbQuery", "SELECT * FROM json", function(users) { - var address, hubs, site, site_users, user, _i, _len, _name; + var address, hubs, i, len, name, site, site_users, user; site_users = {}; - for (_i = 0, _len = users.length; _i < _len; _i++) { - user = users[_i]; - if (site_users[_name = user.hub] == null) { - site_users[_name] = []; + for (i = 0, len = users.length; i < len; i++) { + user = users[i]; + if (site_users[name = user.hub] == null) { + site_users[name] = []; } site_users[user.hub].push(user); } @@ -3388,22 +3527,22 @@ function clone(obj) { return Page.projector.scheduleRender(); }); _this.default_hubs = []; - _ref = Page.site_info.content.settings.default_hubs; - _results = []; - for (address in _ref) { - content = _ref[address]; + ref = Page.site_info.content.settings.default_hubs; + results = []; + for (address in ref) { + content = ref[address]; if (!sites[address] && !_this.downloading[address]) { - _results.push(_this.default_hubs.push({ + results.push(_this.default_hubs.push({ users: [], address: address, content: content, type: "available" })); } else { - _results.push(void 0); + results.push(void 0); } } - return _results; + return results; }; })(this)); }; @@ -3427,8 +3566,8 @@ function clone(obj) { }, "Join!"), h("div.avatars", [ hub.users.map((function(_this) { return function(user) { - var avatar, _ref; - if (((_ref = user.avatar) !== "jpg" && _ref !== "png") || rendered >= 4) { + var avatar, ref; + if (((ref = user.avatar) !== "jpg" && ref !== "png") || rendered >= 4) { return ""; } avatar = "merged-ZeroMe/" + hub.address + "/" + user.directory + "/avatar." + user.avatar; @@ -3461,7 +3600,7 @@ function clone(obj) { }; ContentCreateProfile.prototype.render = function() { - var _ref; + var ref; if (this.loaded && !Page.on_loaded.resolved) { Page.on_loaded.resolve(); } @@ -3473,7 +3612,7 @@ function clone(obj) { h("h1", "Create new profile"), h("a.button.button-submit.button-certselect.certselect", { href: "#Select+user", onclick: this.handleSelectUserClick - }, [h("div.icon.icon-profile"), ((_ref = Page.site_info) != null ? _ref.cert_user_id : void 0) ? "As: " + Page.site_info.cert_user_id : "Select ID..."]), this.creation_status.length > 0 ? h("div.creation-status", { + }, [h("div.icon.icon-profile"), ((ref = Page.site_info) != null ? ref.cert_user_id : void 0) ? "As: " + Page.site_info.cert_user_id : "Select ID..."]), this.creation_status.length > 0 ? h("div.creation-status", { enterAnimation: Animation.slideDown, exitAnimation: Animation.slideUp }, [ @@ -3515,42 +3654,224 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/ContentFeed.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/ContentFeed.coffee ---- */ (function() { var ContentFeed, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; - ContentFeed = (function(_super) { - __extends(ContentFeed, _super); + ContentFeed = (function(superClass) { + extend(ContentFeed, superClass); function ContentFeed() { - this.update = __bind(this.update, this); - this.render = __bind(this.render, this); - this.handleListTypeClick = __bind(this.handleListTypeClick, this); + this.update = bind(this.update, this); + this.render = bind(this.render, this); + this.queryLanguageIds = bind(this.queryLanguageIds, this); + this.handleFiltersClick = bind(this.handleFiltersClick, this); + this.renderFilterLanguage = bind(this.renderFilterLanguage, this); + this.handleLanguageClick = bind(this.handleLanguageClick, this); + this.handleHubsClick = bind(this.handleHubsClick, this); + this.renderHubsMenu = bind(this.renderHubsMenu, this); + this.handleListTypeClick = bind(this.handleListTypeClick, this); this.post_create = new PostCreate(); this.post_list = new PostList(); this.activity_list = new ActivityList(); this.new_user_list = new UserList("new"); this.suggested_user_list = new UserList("suggested"); + this.hubs = new Menu(); + this.lang_filter = new Menu(); + this.filter_lang_list = {}; this.need_update = true; this.type = "followed"; this.update(); + this.language_dict = { + "English": /[\u0041-\u007A]/, + "Latin-1": /[\u00C0-\u00FF]/, + "Greek": /[\u0391-\u03C9]/, + "Cyrillic": /[\u0410-\u044F]/, + "Armenian": /[\u0531-\u0586]/, + "Hebrew": /[\u05D0-\u05EA]/, + "Arabic": /[\u0620-\u06D5]/, + "Devanagari": /[\u0904-\u097F]/, + "Kana": /[\u3041-\u30FA]/, + "ZH-JA-KO": /[\u4E00-\u9FEA]/, + "Hangul": /[\uAC00-\uD7A3]/, + "Emoji": /[\ud83C-\ud83E][\uDC00-\uDDEF]/ + }; } ContentFeed.prototype.handleListTypeClick = function(e) { this.type = e.currentTarget.attributes.type.value; + if (this.type === "everyone") { + this.filter_lang_list = {}; + } else if (this.type === "lang") { + Page.local_storage.settings.filter_lang_list = this.filter_lang_list; + Page.saveLocalStorage(); + } this.post_list.limit = 10; this.activity_list.limit = 10; this.update(); return false; }; + ContentFeed.prototype.renderHubsMenu = function(hub_title, address) { + return h("a.link", { + href: "#" + hub_title, + onclick: this.handleListTypeClick, + type: "hub" + "_" + address, + classes: { + active: this.type === "hub" + "_" + address + } + }, hub_title); + }; + + ContentFeed.prototype.handleHubsClick = function() { + this.hubs.items = []; + Page.cmd("mergerSiteList", true, (function(_this) { + return function(sites) { + var address, site; + for (address in sites) { + site = sites[address]; + if (address === Page.userdb) { + continue; + } + _this.hubs.items.push([_this.renderHubsMenu(site.content.title, address), null]); + } + return _this.hubs.toggle(); + }; + })(this)); + return false; + }; + + ContentFeed.prototype.handleLanguageClick = function(e) { + var value; + value = e.currentTarget.value; + if (this.filter_lang_list[value]) { + delete this.filter_lang_list[value]; + } else { + this.filter_lang_list[value] = true; + } + if (value.slice(0, 7) === "lang-on") { + delete this.filter_lang_list["lang-off" + value.slice(7)]; + } else if (value.slice(0, 8) === "lang-off") { + delete this.filter_lang_list["lang-on" + value.slice(8)]; + } + this.lang_filter.items = []; + this.lang_filter.items.push([this.renderFilterLanguage(), null]); + return false; + }; + + ContentFeed.prototype.renderFilterLanguage = function() { + var lang, langs; + this.filter_lang_list = Page.local_storage.settings.filter_lang_list; + langs = Object.keys(this.language_dict); + return h("div.menu-radio", h("a.all", { + href: "#all", + onclick: this.handleListTypeClick, + type: "everyone", + classes: { + active: this.type === "everyone" + } + }, "Show all"), h("a.filter", { + href: "#filter", + onclick: this.handleListTypeClick, + type: "lang", + classes: { + active: this.type === "lang" + } + }, "Filter"), (function() { + var j, len, results; + results = []; + for (j = 0, len = langs.length; j < len; j++) { + lang = langs[j]; + results.push([ + h("span", h("a.lang-on", { + href: "#" + lang + "_on", + onclick: this.handleLanguageClick, + value: "lang-on" + "_" + lang, + classes: { + selected: this.filter_lang_list["lang-on" + "_" + lang] + } + }, " +"), h("a.lang-off", { + href: "#" + lang + "_off", + onclick: this.handleLanguageClick, + value: "lang-off" + "_" + lang, + classes: { + selected: this.filter_lang_list["lang-off" + "_" + lang] + } + }, "- "), " ", lang) + ]); + } + return results; + }).call(this)); + }; + + ContentFeed.prototype.handleFiltersClick = function() { + this.lang_filter.items = []; + this.lang_filter.items.push([this.renderFilterLanguage(), null]); + if (this.lang_filter.visible) { + this.lang_filter.hide(); + } else { + this.lang_filter.show(); + } + return false; + }; + + ContentFeed.prototype.queryLanguageIds = function(query, lang_list, cb) { + var language_ids; + language_ids = []; + return Page.cmd("dbQuery", [query], (function(_this) { + return function(rows) { + var body_tmp, i, j, k, l, lang_off, lang_on, len, len1, len2, m, matched, ref, ref1, row, start_point; + for (j = 0, len = rows.length; j < len; j++) { + row = rows[j]; + if (row["body"] === null) { + continue; + } + if (row["body"].length > 100) { + body_tmp = ""; + for (i = k = 0; k <= 9; i = ++k) { + start_point = ~~(row["body"].length / 10) * i; + body_tmp += row["body"].slice(start_point, start_point + 9); + } + row["body"] = body_tmp; + } + matched = false; + ref = lang_list["off"]; + for (l = 0, len1 = ref.length; l < len1; l++) { + lang_off = ref[l]; + if (row["body"].match(_this.language_dict[lang_off])) { + matched = true; + break; + } + if (lang_off === lang_list["off"].slice(-1)[0]) { + if (lang_list["on"].length === 0) { + language_ids.push([row["item_id"], row["json_id"]]); + } + } + } + if (!matched) { + ref1 = lang_list["on"]; + for (m = 0, len2 = ref1.length; m < len2; m++) { + lang_on = ref1[m]; + if (row["body"].match(_this.language_dict[lang_on])) { + language_ids.push([row["item_id"], row["json_id"]]); + break; + } + } + } + } + return cb(language_ids); + }; + })(this)); + }; + ContentFeed.prototype.render = function() { - var followed, key, like, _; + var _, followed, j, key, lang, lang_list, len, like, query, ref; if (this.post_list.loaded && !Page.on_loaded.resolved) { Page.on_loaded.resolve(); } @@ -3559,16 +3880,23 @@ function clone(obj) { this.need_update = false; this.new_user_list.need_update = true; this.suggested_user_list.need_update = true; + this.post_list.filter_post_ids = null; + this.post_list.filter_hub = null; + this.post_list.filter_language_ids = null; + this.post_list.directories = "all"; + this.activity_list.filter_hub = null; + this.activity_list.filter_language_ids = null; + this.activity_list.directories = "all"; if (this.type === "followed") { this.post_list.directories = (function() { - var _ref, _results; - _ref = Page.user.followed_users; - _results = []; - for (key in _ref) { - followed = _ref[key]; - _results.push("data/users/" + (key.split('/')[1])); + var ref, results; + ref = Page.user.followed_users; + results = []; + for (key in ref) { + followed = ref[key]; + results.push("data/users/" + (key.split('/')[1])); } - return _results; + return results; })(); if (Page.user.hub) { this.post_list.directories.push("data/users/" + Page.user.auth_address); @@ -3576,56 +3904,108 @@ function clone(obj) { this.post_list.filter_post_ids = null; } else if (this.type === "liked") { this.post_list.directories = (function() { - var _ref, _results; - _ref = Page.user.likes; - _results = []; - for (like in _ref) { - _ = _ref[like]; - _results.push("data/users/" + (like.split('_')[0])); + var ref, results; + ref = Page.user.likes; + results = []; + for (like in ref) { + _ = ref[like]; + results.push("data/users/" + (like.split('_')[0])); } - return _results; + return results; })(); this.post_list.filter_post_ids = (function() { - var _ref, _results; - _ref = Page.user.likes; - _results = []; - for (like in _ref) { - _ = _ref[like]; - _results.push(like.split('_')[1]); + var ref, results; + ref = Page.user.likes; + results = []; + for (like in ref) { + _ = ref[like]; + results.push(like.split('_')[1]); } - return _results; + return results; })(); - } else { - this.post_list.directories = "all"; - this.post_list.filter_post_ids = null; + } else if (this.type.slice(0, 3) === "hub") { + this.post_list.filter_hub = this.type.slice(4); + } else if (this.type === "lang") { + lang_list = { + "on": [], + "off": [] + }; + ref = Object.keys(this.filter_lang_list); + for (j = 0, len = ref.length; j < len; j++) { + lang = ref[j]; + if (lang.slice(0, 7) === "lang-on") { + lang_list["on"].push(lang.slice(8)); + } else { + lang_list["off"].push(lang.slice(9)); + } + } + query = "SELECT post_id AS item_id, post.json_id, post.body FROM post"; + this.queryLanguageIds(query, lang_list, (function(_this) { + return function(language_ids) { + var id_pair; + _this.post_list.filter_language_ids = "(VALUES " + ((function() { + var k, len1, results; + results = []; + for (k = 0, len1 = language_ids.length; k < len1; k++) { + id_pair = language_ids[k]; + results.push("(" + id_pair[0] + "," + id_pair[1] + ")"); + } + return results; + })()).join(',') + ")"; + return _this.post_list.need_update = true; + }; + })(this)); + } + if (this.type.slice(0, 4) !== "lang") { + this.post_list.need_update = true; } - this.post_list.need_update = true; if (this.type === "followed") { this.activity_list.directories = (function() { - var _ref, _results; - _ref = Page.user.followed_users; - _results = []; - for (key in _ref) { - followed = _ref[key]; - _results.push("data/users/" + (key.split('/')[1])); + var ref1, results; + ref1 = Page.user.followed_users; + results = []; + for (key in ref1) { + followed = ref1[key]; + results.push("data/users/" + (key.split('/')[1])); } - return _results; + return results; })(); - } else { - this.activity_list.directories = "all"; + } else if (this.type.slice(0, 3) === "hub") { + this.activity_list.directories = "hub"; + this.activity_list.filter_hub = this.type.slice(4); + } else if (this.type === "lang") { + query = "SELECT comment_id AS item_id, comment.json_id, comment.body FROM comment"; + this.queryLanguageIds(query, lang_list, (function(_this) { + return function(language_ids) { + var id_pair; + _this.activity_list.filter_language_ids = "(VALUES " + ((function() { + var k, len1, results; + results = []; + for (k = 0, len1 = language_ids.length; k < len1; k++) { + id_pair = language_ids[k]; + results.push("(" + id_pair[0] + "," + id_pair[1] + ")"); + } + return results; + })()).join(',') + ")"; + return _this.activity_list.update(); + }; + })(this)); + } + if (this.type.slice(0, 4) !== "lang") { + this.activity_list.update(); } - this.activity_list.update(); } return h("div#Content.center", [ h("div.col-center", [ - this.post_create.render(), h("div.post-list-type", h("a.link", { - href: "#Everyone", - onclick: this.handleListTypeClick, - type: "everyone", - classes: { - active: this.type === "everyone" - } - }, "Everyone"), h("a.link", { + this.post_create.render(), h("div.post-list-type", h("div.hub-menu", h("a.link", { + href: "#Hubs", + onmousedown: this.handleHubsClick, + onclick: Page.returnFalse + }, "Hubs"), this.hubs.render()), h("div.filters-menu", h("a.link", { + href: "#Filters", + onmousedown: this.handleFiltersClick, + onclick: Page.returnFalse + }, "Everyone"), this.lang_filter.render()), h("a.link", { href: "#Liked", onclick: this.handleListTypeClick, type: "liked", @@ -3665,7 +4045,8 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/ContentProfile.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/ContentProfile.coffee ---- */ (function() { @@ -3941,6 +4322,7 @@ function clone(obj) { style: "color: " + (Text.toColor(this.user.row.auth_address)) }, this.owned ? this.editable_user_name.render(this.user.row.user_name) : h("a", { href: this.user.getLink(), + style: "color: " + (Text.toColor(this.user.row.auth_address)), onclick: Page.handleLinkClick }, this.user.row.user_name)), h("div.cert_user_id", this.user.row.cert_user_id), this.owned ? h("div.intro-full", this.editable_intro.render(this.user.row.intro)) : h("div.intro-full", { innerHTML: Text.renderMarked(this.user.row.intro) @@ -3988,25 +4370,26 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/ContentUsers.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/ContentUsers.coffee ---- */ (function() { var ContentUsers, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; - ContentUsers = (function(_super) { - __extends(ContentUsers, _super); + ContentUsers = (function(superClass) { + extend(ContentUsers, superClass); function ContentUsers() { - this.update = __bind(this.update, this); - this.render = __bind(this.render, this); - this.handleSearchInput = __bind(this.handleSearchInput, this); - this.handleRecentMoreClick = __bind(this.handleRecentMoreClick, this); - this.handleActiveMoreClick = __bind(this.handleActiveMoreClick, this); - this.handleSuggestedMoreClick = __bind(this.handleSuggestedMoreClick, this); + this.update = bind(this.update, this); + this.render = bind(this.render, this); + this.handleSearchInput = bind(this.handleSearchInput, this); + this.handleRecentMoreClick = bind(this.handleRecentMoreClick, this); + this.handleActiveMoreClick = bind(this.handleActiveMoreClick, this); + this.handleSuggestedMoreClick = bind(this.handleSuggestedMoreClick, this); this.user_list_suggested = new UserList("suggested"); this.user_list_suggested.limit = 9; this.user_list_active = new UserList("active"); @@ -4069,7 +4452,7 @@ function clone(obj) { }; ContentUsers.prototype.render = function() { - var _ref, _ref1, _ref2; + var ref, ref1, ref2; if (this.loaded && !Page.on_loaded.resolved) { Page.on_loaded.resolve(); } @@ -4084,15 +4467,15 @@ function clone(obj) { if (this.need_update) { this.log("Updating"); this.need_update = false; - if ((_ref = this.user_list_recent) != null) { - _ref.need_update = true; + if ((ref = this.user_list_recent) != null) { + ref.need_update = true; } - if ((_ref1 = this.user_list_active) != null) { - _ref1.need_update = true; + if ((ref1 = this.user_list_active) != null) { + ref1.need_update = true; } if (Page.user.auth_address) { - if ((_ref2 = this.user_list_suggested) != null) { - _ref2.need_update = true; + if ((ref2 = this.user_list_suggested) != null) { + ref2.need_update = true; } } } @@ -4141,30 +4524,31 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/Head.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/Head.coffee ---- */ (function() { var Head, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty, - __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty, + indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; - Head = (function(_super) { - __extends(Head, _super); + Head = (function(superClass) { + extend(Head, superClass); function Head() { - this.render = __bind(this.render, this); - this.saveFollows = __bind(this.saveFollows, this); - this.handleMenuClick = __bind(this.handleMenuClick, this); - this.handleFollowMenuItemClick = __bind(this.handleFollowMenuItemClick, this); + this.render = bind(this.render, this); + this.saveFollows = bind(this.saveFollows, this); + this.handleMenuClick = bind(this.handleMenuClick, this); + this.handleFollowMenuItemClick = bind(this.handleFollowMenuItemClick, this); this.menu = new Menu(); this.follows = []; } Head.prototype.handleSelectUserClick = function() { - if (__indexOf.call(Page.site_info.settings.permissions, "Merger:ZeroMe") < 0) { + if (indexOf.call(Page.site_info.settings.permissions, "Merger:ZeroMe") < 0) { Page.cmd("wrapperPermissionAdd", "Merger:ZeroMe", (function(_this) { return function() { return Page.updateSiteInfo(function() { @@ -4192,13 +4576,14 @@ function clone(obj) { }; Head.prototype.handleMenuClick = function() { - var _ref; - if (!((_ref = Page.site_info) != null ? _ref.cert_user_id : void 0)) { + var ref; + if (!((ref = Page.site_info) != null ? ref.cert_user_id : void 0)) { return this.handleSelectUserClick(); } Page.cmd("feedListFollow", [], (function(_this) { - return function(_at_follows) { - _this.follows = _at_follows; + return function(follows) { + var fn, key, ref1, val; + _this.follows = follows; _this.menu.items = []; _this.menu.items.push([ "Follow username mentions", (function(item) { @@ -4225,6 +4610,51 @@ function clone(obj) { return false; }), Page.local_storage.settings.hide_hello_zerome ]); + _this.menu.items.push(["---"]); + _this.menu.items.push([ + "Show posts since", (function(item) { + Page.local_storage.settings.show_since = document.getElementById("show-since-day").value; + item[2] = Page.local_storage.settings.show_since; + Page.projector.scheduleRender(); + Page.saveLocalStorage(); + Page.content.need_update = true; + return false; + }), Page.local_storage.settings.show_since + ]); + _this.menu.items.push([ + "Show posts after", (function(item) { + Page.local_storage.settings.show_after = document.getElementById("show-after-date").value; + item[2] = Page.local_storage.settings.show_after; + Page.projector.scheduleRender(); + Page.saveLocalStorage(); + Page.content.need_update = true; + return false; + }), Page.local_storage.settings.show_after + ]); + if (((function() { + var results; + results = []; + for (key in Page.user_hubs) { + results.push(key); + } + return results; + })()).length > 1) { + _this.menu.items.push(["---"]); + ref1 = Page.user_hubs; + fn = function(key) { + return _this.menu.items.push([ + "Use hub " + key, (function(item) { + Page.local_storage.settings.hub = key; + Page.saveLocalStorage(); + return Page.checkUser(); + }), Page.user.row.site === key + ]); + }; + for (key in ref1) { + val = ref1[key]; + fn(key); + } + } _this.menu.toggle(); return Page.projector.scheduleRender(); }; @@ -4248,7 +4678,7 @@ function clone(obj) { }; Head.prototype.render = function() { - var _ref, _ref1, _ref2, _ref3; + var ref, ref1, ref2, ref3; return h("div.head.center", [ h("a.logo", { href: "?Home", @@ -4257,7 +4687,7 @@ function clone(obj) { src: "img/logo.svg", height: 40, onerror: "this.src='img/logo.png'; this.onerror=null;" - })), ((_ref = Page.user) != null ? _ref.hub : void 0) ? h("div.right.authenticated", [ + })), ((ref = Page.user) != null ? ref.hub : void 0) ? h("div.right.authenticated", [ h("div.user", h("a.name.link", { href: Page.user.getLink(), onclick: Page.handleLinkClick @@ -4269,7 +4699,7 @@ function clone(obj) { onclick: Page.returnFalse, onmousedown: this.handleMenuClick }, "\u22EE"), this.menu.render() - ]) : !((_ref1 = Page.user) != null ? _ref1.hub : void 0) && ((_ref2 = Page.site_info) != null ? _ref2.cert_user_id : void 0) ? h("div.right.selected", [ + ]) : !((ref1 = Page.user) != null ? ref1.hub : void 0) && ((ref2 = Page.site_info) != null ? ref2.cert_user_id : void 0) ? h("div.right.selected", [ h("div.user", h("a.name.link", { href: "?Create+profile", onclick: Page.handleLinkClick @@ -4281,7 +4711,7 @@ function clone(obj) { onclick: Page.returnFalse, onmousedown: this.handleMenuClick }, "\u22EE") - ]) : !((_ref3 = Page.user) != null ? _ref3.hub : void 0) && Page.site_info ? h("div.right.unknown", [ + ]) : !((ref3 = Page.user) != null ? ref3.hub : void 0) && Page.site_info ? h("div.right.unknown", [ h("div.user", h("a.name.link", { href: "#Select+user", onclick: this.handleSelectUserClick @@ -4306,36 +4736,37 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/Post.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/Post.coffee ---- */ (function() { var Post, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty, - __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; - - Post = (function(_super) { - __extends(Post, _super); - - function Post(row, _at_item_list) { - this.item_list = _at_item_list; - this.render = __bind(this.render, this); - this.renderComments = __bind(this.renderComments, this); - this.follow = __bind(this.follow, this); - this.unfollow = __bind(this.unfollow, this); - this.handleSettingsClick = __bind(this.handleSettingsClick, this); - this.getPostUri = __bind(this.getPostUri, this); - this.handleReplyClick = __bind(this.handleReplyClick, this); - this.handleMoreCommentsClick = __bind(this.handleMoreCommentsClick, this); - this.handleCommentDelete = __bind(this.handleCommentDelete, this); - this.handleCommentSave = __bind(this.handleCommentSave, this); - this.handleCommentSubmit = __bind(this.handleCommentSubmit, this); - this.handleCommentClick = __bind(this.handleCommentClick, this); - this.handleLikeClick = __bind(this.handleLikeClick, this); - this.handlePostDelete = __bind(this.handlePostDelete, this); - this.handlePostSave = __bind(this.handlePostSave, this); + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty, + indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; + + Post = (function(superClass) { + extend(Post, superClass); + + function Post(row, item_list) { + this.item_list = item_list; + this.render = bind(this.render, this); + this.renderComments = bind(this.renderComments, this); + this.follow = bind(this.follow, this); + this.unfollow = bind(this.unfollow, this); + this.handleSettingsClick = bind(this.handleSettingsClick, this); + this.getPostUri = bind(this.getPostUri, this); + this.handleReplyClick = bind(this.handleReplyClick, this); + this.handleMoreCommentsClick = bind(this.handleMoreCommentsClick, this); + this.handleCommentDelete = bind(this.handleCommentDelete, this); + this.handleCommentSave = bind(this.handleCommentSave, this); + this.handleCommentSubmit = bind(this.handleCommentSubmit, this); + this.handleCommentClick = bind(this.handleCommentClick, this); + this.handleLikeClick = bind(this.handleLikeClick, this); + this.handlePostDelete = bind(this.handlePostDelete, this); + this.handlePostSave = bind(this.handlePostSave, this); this.liked = false; this.commenting = false; this.submitting_like = false; @@ -4343,7 +4774,8 @@ function clone(obj) { this.editable_comments = {}; this.field_comment = new Autosize({ placeholder: "Add your comment", - onsubmit: this.handleCommentSubmit + onsubmit: this.handleCommentSubmit, + title_submit: "Send" }); this.comment_limit = 3; this.menu = null; @@ -4353,7 +4785,7 @@ function clone(obj) { } Post.prototype.setRow = function(row) { - var _ref; + var ref; this.row = row; if (this.row.meta) { this.meta = new PostMeta(this, JSON.parse(this.row.meta)); @@ -4366,7 +4798,7 @@ function clone(obj) { auth_address: row.directory.replace("data/users/", "") }); this.user.row = row; - this.owned = this.user.auth_address === ((_ref = Page.user) != null ? _ref.auth_address : void 0); + this.owned = this.user.auth_address === ((ref = Page.user) != null ? ref.auth_address : void 0); if (this.owned) { this.editable_body = new Editable("div.body", this.handlePostSave, this.handlePostDelete); this.editable_body.render_function = Text.renderMarked; @@ -4381,10 +4813,10 @@ function clone(obj) { Post.prototype.handlePostSave = function(body, cb) { return Page.user.getData(Page.user.hub, (function(_this) { return function(data) { - var i, post, post_index, _i, _len, _ref; - _ref = data.post; - for (i = _i = 0, _len = _ref.length; _i < _len; i = ++_i) { - post = _ref[i]; + var i, j, len, post, post_index, ref; + ref = data.post; + for (i = j = 0, len = ref.length; j < len; i = ++j) { + post = ref[i]; if (post.post_id === _this.row.post_id) { post_index = i; } @@ -4400,16 +4832,16 @@ function clone(obj) { Post.prototype.handlePostDelete = function(cb) { return Page.user.getData(Page.user.hub, (function(_this) { return function(data) { - var i, post, post_index, _i, _len, _ref, _ref1, _ref2; - _ref = data.post; - for (i = _i = 0, _len = _ref.length; _i < _len; i = ++_i) { - post = _ref[i]; + var i, j, len, post, post_index, ref, ref1, ref2; + ref = data.post; + for (i = j = 0, len = ref.length; j < len; i = ++j) { + post = ref[i]; if (post.post_id === _this.row.post_id) { post_index = i; } } data.post.splice(post_index, 1); - if ((_ref1 = _this.meta) != null ? (_ref2 = _ref1.meta) != null ? _ref2.img : void 0 : void 0) { + if ((ref1 = _this.meta) != null ? (ref2 = ref1.meta) != null ? ref2.img : void 0 : void 0) { return Page.cmd("fileDelete", (_this.user.getPath()) + "/" + _this.row.post_id + ".jpg", function() { return Page.user.save(data, Page.user.hub, function(res) { return cb(res); @@ -4425,9 +4857,9 @@ function clone(obj) { }; Post.prototype.handleLikeClick = function(e) { - var post_uri, site, _ref; + var post_uri, ref, site; this.submitting_like = true; - _ref = this.row.key.split("-"), site = _ref[0], post_uri = _ref[1]; + ref = this.row.key.split("-"), site = ref[0], post_uri = ref[1]; if (Page.user.likes[post_uri]) { Animation.flashOut(e.currentTarget.firstChild); Page.user.dislike(site, post_uri, (function(_this) { @@ -4463,13 +4895,16 @@ function clone(obj) { }; Post.prototype.handleCommentSubmit = function() { - var post_uri, site, timer_loading, _ref; + var post_uri, ref, site, timer_loading; + if (!this.field_comment.attrs.value) { + return; + } timer_loading = setTimeout(((function(_this) { return function() { return _this.field_comment.loading = true; }; })(this)), 100); - _ref = this.row.key.split("-"), site = _ref[0], post_uri = _ref[1]; + ref = this.row.key.split("-"), site = ref[0], post_uri = ref[1]; return Page.user.comment(site, post_uri, this.field_comment.attrs.value, (function(_this) { return function(res) { clearInterval(timer_loading); @@ -4485,10 +4920,10 @@ function clone(obj) { Post.prototype.handleCommentSave = function(comment_id, body, cb) { return Page.user.getData(this.row.site, (function(_this) { return function(data) { - var comment, comment_index, i, _i, _len, _ref; - _ref = data.comment; - for (i = _i = 0, _len = _ref.length; _i < _len; i = ++_i) { - comment = _ref[i]; + var comment, comment_index, i, j, len, ref; + ref = data.comment; + for (i = j = 0, len = ref.length; j < len; i = ++j) { + comment = ref[i]; if (comment.comment_id === comment_id) { comment_index = i; } @@ -4504,10 +4939,10 @@ function clone(obj) { Post.prototype.handleCommentDelete = function(comment_id, cb) { return Page.user.getData(this.row.site, (function(_this) { return function(data) { - var comment, comment_index, i, _i, _len, _ref; - _ref = data.comment; - for (i = _i = 0, _len = _ref.length; _i < _len; i = ++_i) { - comment = _ref[i]; + var comment, comment_index, i, j, len, ref; + ref = data.comment; + for (i = j = 0, len = ref.length; j < len; i = ++j) { + comment = ref[i]; if (comment.comment_id === comment_id) { comment_index = i; } @@ -4539,9 +4974,9 @@ function clone(obj) { }; Post.prototype.getEditableComment = function(comment_uri) { - var comment_id, handleCommentDelete, handleCommentSave, user_address, _ref; + var comment_id, handleCommentDelete, handleCommentSave, ref, user_address; if (!this.editable_comments[comment_uri]) { - _ref = comment_uri.split("_"), user_address = _ref[0], comment_id = _ref[1]; + ref = comment_uri.split("_"), user_address = ref[0], comment_id = ref[1]; handleCommentSave = (function(_this) { return function(body, cb) { return _this.handleCommentSave(parseInt(comment_id), body, cb); @@ -4566,11 +5001,11 @@ function clone(obj) { this.css_style = "z-index: " + this.row.date_added + "; position: relative"; Page.cmd("feedListFollow", [], (function(_this) { return function(follows) { - var followed, _ref; + var followed, ref; if (!_this.menu) { _this.menu = new Menu(); } - followed = follows["Post follow"] && (_ref = _this.getPostUri(), __indexOf.call(follows["Post follow"][1], _ref) >= 0); + followed = follows["Post follow"] && (ref = _this.getPostUri(), indexOf.call(follows["Post follow"][1], ref) >= 0); _this.menu.items = []; _this.menu.items.push([ "Follow in newsfeed", (function() { @@ -4626,7 +5061,7 @@ function clone(obj) { }; Post.prototype.renderComments = function() { - var comment_limit, _ref, _ref1; + var comment_limit, ref, ref1; if (!this.row.comments && !this.commenting) { return []; } @@ -4643,12 +5078,12 @@ function clone(obj) { }, [ this.commenting ? h("div.comment-create", { enterAnimation: Animation.slideDown - }, this.field_comment.render()) : void 0, (_ref = this.row.comments) != null ? _ref.slice(0, +(comment_limit - 1) + 1 || 9e9).map((function(_this) { + }, this.field_comment.render()) : void 0, (ref = this.row.comments) != null ? ref.slice(0, +(comment_limit - 1) + 1 || 9e9).map((function(_this) { return function(comment) { - var comment_uri, owned, user_address, user_link, _ref1, _ref2; + var comment_uri, owned, ref1, ref2, user_address, user_link; user_address = comment.directory.replace("data/users/", ""); comment_uri = user_address + "_" + comment.comment_id; - owned = user_address === ((_ref1 = Page.user) != null ? _ref1.auth_address : void 0); + owned = user_address === ((ref1 = Page.user) != null ? ref1.auth_address : void 0); user_link = "?Profile/" + comment.hub + "/" + user_address + "/" + comment.cert_user_id; return h("div.comment", { id: comment_uri, @@ -4672,7 +5107,7 @@ function clone(obj) { onclick: _this.handleReplyClick, user_name: comment.user_name }, "Reply") - ]), owned ? _this.getEditableComment(comment_uri).render(comment.body) : ((_ref2 = comment.body) != null ? _ref2.length : void 0) > 5000 ? h("div.body.maxheight", { + ]), owned ? _this.getEditableComment(comment_uri).render(comment.body) : ((ref2 = comment.body) != null ? ref2.length : void 0) > 5000 ? h("div.body.maxheight", { innerHTML: Text.renderMarked(comment.body), afterCreate: Maxheight.apply }) : h("div.body", { @@ -4680,7 +5115,7 @@ function clone(obj) { }) ]); }; - })(this)) : void 0, ((_ref1 = this.row.comments) != null ? _ref1.length : void 0) > comment_limit ? h("a.more", { + })(this)) : void 0, ((ref1 = this.row.comments) != null ? ref1.length : void 0) > comment_limit ? h("a.more", { href: "#More", onclick: this.handleMoreCommentsClick, enterAnimation: Animation.slideDown, @@ -4690,8 +5125,8 @@ function clone(obj) { }; Post.prototype.render = function() { - var post_uri, site, _ref, _ref1, _ref2, _ref3; - _ref = this.row.key.split("-"), site = _ref[0], post_uri = _ref[1]; + var post_uri, ref, ref1, ref2, ref3, site; + ref = this.row.key.split("-"), site = ref[0], post_uri = ref[1]; return h("div.post", { key: this.row.key, enterAnimation: Animation.slideDown, @@ -4723,7 +5158,7 @@ function clone(obj) { }, "\u22EE") ]), this.owned ? this.editable_body.render(this.row.body) : h("div.body", { classes: { - maxheight: !this.row.selected && ((_ref1 = this.row.body) != null ? _ref1.length : void 0) > 3000 + maxheight: !this.row.selected && ((ref1 = this.row.body) != null ? ref1.length : void 0) > 3000 }, innerHTML: Text.renderMarked(this.row.body), afterCreate: Maxheight.apply, @@ -4734,7 +5169,7 @@ function clone(obj) { onclick: this.handleCommentClick }, "Comment"), h("a.like.link", { classes: { - active: (_ref2 = Page.user) != null ? _ref2.likes[post_uri] : void 0, + active: (ref2 = Page.user) != null ? ref2.likes[post_uri] : void 0, loading: this.submitting_like, "like-zero": this.row.likes === 0 }, @@ -4742,7 +5177,7 @@ function clone(obj) { onclick: this.handleLikeClick }, h("div.icon.icon-heart", { classes: { - active: (_ref3 = Page.user) != null ? _ref3.likes[post_uri] : void 0 + active: (ref3 = Page.user) != null ? ref3.likes[post_uri] : void 0 } }), this.row.likes ? this.row.likes : void 0) ]), this.renderComments() @@ -4758,25 +5193,26 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/PostCreate.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/PostCreate.coffee ---- */ (function() { var PostCreate, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; - PostCreate = (function(_super) { - __extends(PostCreate, _super); + PostCreate = (function(superClass) { + extend(PostCreate, superClass); function PostCreate() { - this.render = __bind(this.render, this); - this.handleUploadClick = __bind(this.handleUploadClick, this); - this.handlePostSubmit = __bind(this.handlePostSubmit, this); - this.handleImageClose = __bind(this.handleImageClose, this); - this.handleUpload = __bind(this.handleUpload, this); - this.startEdit = __bind(this.startEdit, this); + this.render = bind(this.render, this); + this.handleUploadClick = bind(this.handleUploadClick, this); + this.handlePostSubmit = bind(this.handlePostSubmit, this); + this.handleImageClose = bind(this.handleImageClose, this); + this.handleUpload = bind(this.handleUpload, this); + this.startEdit = bind(this.startEdit, this); this.field_post = new Autosize({ placeholder: "Write something...", "class": "postfield", @@ -4815,7 +5251,7 @@ function clone(obj) { }; PostCreate.prototype.handlePostSubmit = function() { - var meta, _ref; + var meta, ref; this.field_post.loading = true; if (this.image.height) { meta = {}; @@ -4823,7 +5259,7 @@ function clone(obj) { } else { meta = null; } - Page.user.post(this.field_post.attrs.value, meta, (_ref = this.image.base64uri) != null ? _ref.replace(/.*base64,/, "") : void 0, (function(_this) { + Page.user.post(this.field_post.attrs.value, meta, (ref = this.image.base64uri) != null ? ref.replace(/.*base64,/, "") : void 0, (function(_this) { return function(res) { _this.field_post.loading = false; if (res) { @@ -4913,38 +5349,47 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/PostList.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/PostList.coffee ---- */ (function() { var PostList, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; - PostList = (function(_super) { - __extends(PostList, _super); + PostList = (function(superClass) { + extend(PostList, superClass); function PostList() { - this.render = __bind(this.render, this); - this.storeMoreTag = __bind(this.storeMoreTag, this); - this.addScrollwatcher = __bind(this.addScrollwatcher, this); - this.handleMoreClick = __bind(this.handleMoreClick, this); - this.update = __bind(this.update, this); - this.queryLikes = __bind(this.queryLikes, this); - this.queryComments = __bind(this.queryComments, this); + this.render = bind(this.render, this); + this.storeMoreTag = bind(this.storeMoreTag, this); + this.addScrollwatcher = bind(this.addScrollwatcher, this); + this.handleMoreClick = bind(this.handleMoreClick, this); + this.update = bind(this.update, this); + this.queryLikes = bind(this.queryLikes, this); + this.queryComments = bind(this.queryComments, this); this.item_list = new ItemList(Post, "key"); this.posts = this.item_list.items; this.need_update = true; this.directories = []; this.loaded = false; this.filter_post_ids = null; + this.filter_hub = null; + this.filter_language_ids = null; this.limit = 10; + this.show_after_date = "0"; + this.show_since_day = "0"; } PostList.prototype.queryComments = function(post_uris, cb) { var query; - query = "SELECT post_uri, comment.body, comment.date_added, comment.comment_id, json.cert_auth_type, json.cert_user_id, json.user_name, json.hub, json.directory, json.site FROM comment LEFT JOIN json USING (json_id) WHERE ? AND date_added < " + (Time.timestamp() + 120) + " ORDER BY date_added DESC"; + if ((Page.local_storage.settings.show_since || Page.local_storage.settings.show_after) && Page.local_storage.settings.show_since !== "0") { + query = "SELECT post_uri, comment.body, comment.date_added, comment.comment_id, json.cert_auth_type, json.cert_user_id, json.user_name, json.hub, json.directory, json.site FROM comment LEFT JOIN json USING (json_id) WHERE ? AND date_added < " + (Time.timestamp() + 120) + " ORDER BY date_added ASC"; + } else { + query = "SELECT post_uri, comment.body, comment.date_added, comment.comment_id, json.cert_auth_type, json.cert_user_id, json.user_name, json.hub, json.directory, json.site FROM comment LEFT JOIN json USING (json_id) WHERE ? AND date_added < " + (Time.timestamp() + 120) + " ORDER BY date_added DESC"; + } return Page.cmd("dbQuery", [ query, { post_uri: post_uris @@ -4974,36 +5419,55 @@ function clone(obj) { if (this.filter_post_ids) { where += "AND post_id IN " + (Text.sqlIn(this.filter_post_ids)) + " "; } + if (this.filter_hub) { + where += "AND json.hub = '" + this.filter_hub + "' "; + } + if (this.filter_language_ids) { + where += "AND (post_id, post.json_id) IN " + this.filter_language_ids + " "; + } if (Page.local_storage.settings.hide_hello_zerome) { where += "AND post_id > 1 "; } - query = "SELECT * FROM post LEFT JOIN json ON (post.json_id = json.json_id) " + where + " ORDER BY date_added DESC LIMIT " + (this.limit + 1); + if (Page.local_storage.settings.show_since) { + if (Page.local_storage.settings.show_since !== "0") { + this.show_since_day = Page.local_storage.settings.show_since; + where += "AND date_added > strftime('%s', 'now') - 3600*24*" + String(this.show_since_day) + " "; + } + } else if (Page.local_storage.settings.show_after) { + this.show_after_date = Page.local_storage.settings.show_after - 1; + where += "AND date_added > " + String(this.show_after_date) + " "; + } + if ((Page.local_storage.settings.show_since || Page.local_storage.settings.show_after) && Page.local_storage.settings.show_since !== "0") { + query = "SELECT * FROM post LEFT JOIN json ON (post.json_id = json.json_id) " + where + " ORDER BY date_added ASC LIMIT " + (this.limit + 1); + } else { + query = "SELECT * FROM post LEFT JOIN json ON (post.json_id = json.json_id) " + where + " ORDER BY date_added DESC LIMIT " + (this.limit + 1); + } this.logStart("Update"); return Page.cmd("dbQuery", [query, param], (function(_this) { return function(rows) { - var items, post_uris, row, _i, _len; + var items, j, len, post_uris, row; items = []; post_uris = []; - for (_i = 0, _len = rows.length; _i < _len; _i++) { - row = rows[_i]; + for (j = 0, len = rows.length; j < len; j++) { + row = rows[j]; row["key"] = row["site"] + "-" + row["directory"].replace("data/users/", "") + "_" + row["post_id"]; row["post_uri"] = row["directory"].replace("data/users/", "") + "_" + row["post_id"]; post_uris.push(row["post_uri"]); } _this.queryComments(post_uris, function(comment_rows) { - var comment_db, comment_row, _j, _k, _len1, _len2, _name, _ref; + var comment_db, comment_row, k, l, len1, len2, name, ref; comment_db = {}; - for (_j = 0, _len1 = comment_rows.length; _j < _len1; _j++) { - comment_row = comment_rows[_j]; - if (comment_db[_name = comment_row.site + "/" + comment_row.post_uri] == null) { - comment_db[_name] = []; + for (k = 0, len1 = comment_rows.length; k < len1; k++) { + comment_row = comment_rows[k]; + if (comment_db[name = comment_row.site + "/" + comment_row.post_uri] == null) { + comment_db[name] = []; } comment_db[comment_row.site + "/" + comment_row.post_uri].push(comment_row); } - for (_k = 0, _len2 = rows.length; _k < _len2; _k++) { - row = rows[_k]; + for (l = 0, len2 = rows.length; l < len2; l++) { + row = rows[l]; row["comments"] = comment_db[row.site + "/" + row.post_uri]; - if (((_ref = _this.filter_post_ids) != null ? _ref.length : void 0) === 1 && row.post_id === parseInt(_this.filter_post_ids[0])) { + if (((ref = _this.filter_post_ids) != null ? ref.length : void 0) === 1 && row.post_id === parseInt(_this.filter_post_ids[0])) { row.selected = true; } } @@ -5016,14 +5480,14 @@ function clone(obj) { } }); return _this.queryLikes(post_uris, function(like_rows) { - var like_db, like_row, _j, _k, _len1, _len2; + var k, l, len1, len2, like_db, like_row; like_db = {}; - for (_j = 0, _len1 = like_rows.length; _j < _len1; _j++) { - like_row = like_rows[_j]; + for (k = 0, len1 = like_rows.length; k < len1; k++) { + like_row = like_rows[k]; like_db[like_row["post_uri"]] = like_row["likes"]; } - for (_k = 0, _len2 = rows.length; _k < _len2; _k++) { - row = rows[_k]; + for (l = 0, len2 = rows.length; l < len2; l++) { + row = rows[l]; row["likes"] = like_db[row["post_uri"]]; } _this.item_list.sync(rows); @@ -5042,10 +5506,10 @@ function clone(obj) { PostList.prototype.addScrollwatcher = function() { return setTimeout(((function(_this) { return function() { - var i, item, _i, _len, _ref; - _ref = Page.scrollwatcher.items; - for (i = _i = 0, _len = _ref.length; _i < _len; i = ++_i) { - item = _ref[i]; + var i, item, j, len, ref; + ref = Page.scrollwatcher.items; + for (i = j = 0, len = ref.length; j < len; i = ++j) { + item = ref[i]; if (item[1] === _this.tag_more) { Page.scrollwatcher.items.splice(i, 1); break; @@ -5094,8 +5558,8 @@ function clone(obj) { var err; try { return post.render(); - } catch (_error) { - err = _error; + } catch (error) { + err = error; h("div.error", ["Post render error:", err.message]); return Debug.formatException(err); } @@ -5119,27 +5583,28 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/PostMeta.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/PostMeta.coffee ---- */ (function() { var PostMeta, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; - - PostMeta = (function(_super) { - __extends(PostMeta, _super); - - function PostMeta(_at_post, _at_meta) { - this.post = _at_post; - this.meta = _at_meta; - this.render = __bind(this.render, this); - this.handleImageSettingsClick = __bind(this.handleImageSettingsClick, this); - this.handleImageDeleteClick = __bind(this.handleImageDeleteClick, this); - this.handleOptionalHelpClick = __bind(this.handleOptionalHelpClick, this); - this.handleImageClick = __bind(this.handleImageClick, this); - this.afterCreateImage = __bind(this.afterCreateImage, this); + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; + + PostMeta = (function(superClass) { + extend(PostMeta, superClass); + + function PostMeta(post, meta) { + this.post = post; + this.meta = meta; + this.render = bind(this.render, this); + this.handleImageSettingsClick = bind(this.handleImageSettingsClick, this); + this.handleImageDeleteClick = bind(this.handleImageDeleteClick, this); + this.handleOptionalHelpClick = bind(this.handleOptionalHelpClick, this); + this.handleImageClick = bind(this.handleImageClick, this); + this.afterCreateImage = bind(this.afterCreateImage, this); this; } @@ -5153,8 +5618,8 @@ function clone(obj) { _this.image_preview.optional_info = res; return Page.projector.scheduleRender(); }); - } catch (_error) { - e = _error; + } catch (error) { + e = error; _this.log("Image preview error: " + e); } return Page.projector.scheduleRender(); @@ -5163,8 +5628,8 @@ function clone(obj) { }; PostMeta.prototype.handleImageClick = function(e) { - var image, _ref; - if (this.image_preview.load_fullsize || ((_ref = this.image_preview.optional_info) != null ? _ref.is_downloaded : void 0)) { + var image, ref; + if (this.image_preview.load_fullsize || ((ref = this.image_preview.optional_info) != null ? ref.is_downloaded : void 0)) { Page.overlay.zoomImageTag(e.currentTarget, this.image_preview.width, this.image_preview.height); } else { this.image_preview.load_fullsize = true; @@ -5220,7 +5685,7 @@ function clone(obj) { } this.post.user.hasHelp((function(_this) { return function(helping) { - var _ref; + var ref; if (!_this.menu_image) { _this.menu_image = new Menu(); } @@ -5232,7 +5697,7 @@ function clone(obj) { }) ]); _this.menu_image.items.push(["---"]); - if ((_ref = _this.image_preview.optional_info) != null ? _ref.is_downloaded : void 0) { + if ((ref = _this.image_preview.optional_info) != null ? ref.is_downloaded : void 0) { _this.menu_image.items.push(["Delete image", _this.handleImageDeleteClick]); } else { _this.menu_image.items.push(["Show image", _this.handleImageClick, false]); @@ -5244,19 +5709,19 @@ function clone(obj) { }; PostMeta.prototype.render = function() { - var height, style_fullsize, style_preview, width, _ref, _ref1, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8; + var height, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, ref8, style_fullsize, style_preview, width; if (this.meta.img) { if (!this.image_preview) { this.image_preview = new ImagePreview(); this.image_preview.setPreviewData(this.meta.img); } - _ref = this.image_preview.getSize(530, 600), width = _ref[0], height = _ref[1]; - if ((_ref1 = this.image_preview) != null ? _ref1.preview_uri : void 0) { + ref = this.image_preview.getSize(530, 600), width = ref[0], height = ref[1]; + if ((ref1 = this.image_preview) != null ? ref1.preview_uri : void 0) { style_preview = "background-image: url(" + this.image_preview.preview_uri + ")"; } else { style_preview = ""; } - if (this.image_preview.load_fullsize || ((_ref2 = this.image_preview.optional_info) != null ? _ref2.is_downloaded : void 0)) { + if (this.image_preview.load_fullsize || ((ref2 = this.image_preview.optional_info) != null ? ref2.is_downloaded : void 0)) { style_fullsize = "background-image: url(" + (this.post.user.getPath()) + "/" + this.post.row.post_id + ".jpg)"; } else { style_fullsize = ""; @@ -5265,22 +5730,22 @@ function clone(obj) { afterCreate: this.afterCreateImage, style: "width: " + width + "px; height: " + height + "px; " + style_preview, classes: { - downloaded: (_ref3 = this.image_preview.optional_info) != null ? _ref3.is_downloaded : void 0, - hasinfo: ((_ref4 = this.image_preview.optional_info) != null ? _ref4.peer : void 0) !== null, + downloaded: (ref3 = this.image_preview.optional_info) != null ? ref3.is_downloaded : void 0, + hasinfo: ((ref4 = this.image_preview.optional_info) != null ? ref4.peer : void 0) !== null, loading: this.image_preview.loading } }, h("a.fullsize", { href: "#", onclick: this.handleImageClick, style: style_fullsize - }), Page.server_info.rev < 1700 ? h("small.oldversion", "You need ZeroNet 0.5.0 to view this image") : void 0, ((_ref5 = this.image_preview) != null ? _ref5.optional_info : void 0) ? h("a.show", { + }), Page.server_info.rev < 1700 ? h("small.oldversion", "You need ZeroNet 0.5.0 to view this image") : void 0, ((ref5 = this.image_preview) != null ? ref5.optional_info : void 0) ? h("a.show", { href: "#", onclick: this.handleImageClick - }, h("div.title", "Loading...\nShow image")) : void 0, ((_ref6 = this.image_preview) != null ? _ref6.optional_info : void 0) ? h("a.details", { + }, h("div.title", "Loading...\nShow image")) : void 0, ((ref6 = this.image_preview) != null ? ref6.optional_info : void 0) ? h("a.details", { href: "#Settings", onclick: Page.returnFalse, onmousedown: this.handleImageSettingsClick - }, [h("div.size", Text.formatSize((_ref7 = this.image_preview.optional_info) != null ? _ref7.size : void 0)), h("div.peers.icon-profile"), (_ref8 = this.image_preview.optional_info) != null ? _ref8.peer : void 0, h("a.image-settings", "\u22EE"), this.menu_image ? this.menu_image.render(".menu-right") : void 0]) : void 0); + }, [h("div.size", Text.formatSize((ref7 = this.image_preview.optional_info) != null ? ref7.size : void 0)), h("div.peers.icon-profile"), (ref8 = this.image_preview.optional_info) != null ? ref8.peer : void 0, h("a.image-settings", "\u22EE"), this.menu_image ? this.menu_image.render(".menu-right") : void 0]) : void 0); } }; @@ -5293,7 +5758,8 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/Trigger.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/Trigger.coffee ---- */ (function() { @@ -5344,7 +5810,8 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/User.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/User.coffee ---- */ (function() { @@ -5907,21 +6374,21 @@ function clone(obj) { -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/UserList.coffee ---- */ +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/UserList.coffee ---- */ (function() { var UserList, - __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - __hasProp = {}.hasOwnProperty; + bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + hasProp = {}.hasOwnProperty; - UserList = (function(_super) { - __extends(UserList, _super); + UserList = (function(superClass) { + extend(UserList, superClass); - function UserList(_at_type) { - this.type = _at_type != null ? _at_type : "new"; - this.render = __bind(this.render, this); + function UserList(type1) { + this.type = type1 != null ? type1 : "new"; + this.render = bind(this.render, this); this.item_list = new ItemList(User, "key"); this.users = this.item_list.items; this.need_update = true; @@ -5944,23 +6411,23 @@ function clone(obj) { query = "SELECT user.user_name, follow.*, user.*\nFROM follow\nLEFT JOIN user USING (auth_address, hub)\nWHERE\n follow.json_id = " + this.followed_by.row.json_id + " AND user.json_id IS NOT NULL\n\nUNION\n\nSELECT user.user_name, follow.*, user.*\nFROM follow\nLEFT JOIN json ON (json.directory = 'data/userdb/' || follow.auth_address)\nLEFT JOIN user ON (user.json_id = json.json_id)\nWHERE\n follow.json_id = " + this.followed_by.row.json_id + " AND user.json_id IS NOT NULL AND\n follow.date_added < " + (Time.timestamp() + 120) + "\nORDER BY date_added DESC\nLIMIT " + this.limit; } else if (this.type === "suggested") { followed_user_addresses = (function() { - var _ref, _results; - _ref = Page.user.followed_users; - _results = []; - for (key in _ref) { - val = _ref[key]; - _results.push(key.replace(/.*\//, "")); + var ref, results; + ref = Page.user.followed_users; + results = []; + for (key in ref) { + val = ref[key]; + results.push(key.replace(/.*\//, "")); } - return _results; + return results; })(); followed_user_directories = (function() { - var _i, _len, _results; - _results = []; - for (_i = 0, _len = followed_user_addresses.length; _i < _len; _i++) { - key = followed_user_addresses[_i]; - _results.push("data/users/" + key); + var i, len, results; + results = []; + for (i = 0, len = followed_user_addresses.length; i < len; i++) { + key = followed_user_addresses[i]; + results.push("data/users/" + key); } - return _results; + return results; })(); if (!followed_user_addresses.length) { return; @@ -5973,11 +6440,11 @@ function clone(obj) { } return Page.cmd("dbQuery", [query, params], (function(_this) { return function(rows) { - var followed_by_displayed, row, rows_by_user, user_rows, username, _i, _len; + var followed_by_displayed, i, len, row, rows_by_user, user_rows, username; rows_by_user = {}; followed_by_displayed = {}; - for (_i = 0, _len = rows.length; _i < _len; _i++) { - row = rows[_i]; + for (i = 0, len = rows.length; i < len; i++) { + row = rows[i]; if (row.json_cert_user_id) { row.cert_user_id = row.json_cert_user_id; row.auth_address = row.json_directory.replace("data/userdb/", "").replace("data/users/", ""); @@ -5987,16 +6454,16 @@ function clone(obj) { } if (row.followed_by) { row.followed_by = ((function() { - var _j, _len1, _ref, _results; - _ref = row.followed_by.split(","); - _results = []; - for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) { - username = _ref[_j]; + var j, len1, ref, results; + ref = row.followed_by.split(","); + results = []; + for (j = 0, len1 = ref.length; j < len1; j++) { + username = ref[j]; if (!followed_by_displayed[username]) { - _results.push(username); + results.push(username); } } - return _results; + return results; })())[0]; followed_by_displayed[row.followed_by] = true; } @@ -6006,13 +6473,13 @@ function clone(obj) { } } user_rows = (function() { - var _results; - _results = []; + var results; + results = []; for (key in rows_by_user) { val = rows_by_user[key]; - _results.push(val); + results.push(val); } - return _results; + return results; })(); _this.item_list.sync(user_rows); _this.loading = false; @@ -6054,7 +6521,8 @@ function clone(obj) { }).call(this); -/* ---- /1MeFqFfFFGQfa1J3gJyYYUvb5Lksczq7nH/js/ZeroMe.coffee ---- */ + +/* ---- /1FZWQJgwcgeK5mUFsKA3JnxuQyjdZ5ErP2/js/ZeroMe.coffee ---- */ (function() { @@ -6088,6 +6556,7 @@ function clone(obj) { this.server_info = null; this.address = null; this.user = false; + this.user_hubs = {}; this.user_loaded = false; this.userdb = "1UDbADib99KE9d3qZ87NqJF2QLTHmMkoV"; this.cache_time = Time.timestamp(); @@ -6134,14 +6603,14 @@ function clone(obj) { return function() { _this.log("onloaded"); return window.requestAnimationFrame(function() { - return document.body.className = "loaded"; + return document.body.classList.add("loaded"); }); }; })(this)); this.projector.replace($("#Head"), this.head.render); this.projector.replace($("#Overlay"), this.overlay.render); this.projector.merge($("#Trigger"), this.trigger.render); - this.loadLocalStorage(); + this.loadSettings(); return setInterval((function() { return Page.projector.scheduleRender(); }), 60 * 1000); @@ -6228,7 +6697,7 @@ function clone(obj) { window.scroll(window.pageXOffset, 0); this.history_state["scrollTop"] = 0; this.on_loaded.resolved = false; - document.body.className = ""; + document.body.classList.remove("loaded"); this.setUrl(e.currentTarget.search); return false; } @@ -6249,12 +6718,43 @@ function clone(obj) { return "?" + Text.queryEncode(params); }; + ZeroMe.prototype.loadSettings = function() { + return this.on_site_info.then((function(_this) { + return function() { + return _this.cmd("userGetSettings", [], function(res) { + var base1, base2, base3, base4, base5; + if (!res || res.error) { + return _this.loadLocalStorage(); + } else { + _this.local_storage = res; + if ((base1 = _this.local_storage).followed_users == null) { + base1.followed_users = {}; + } + if ((base2 = _this.local_storage).settings == null) { + base2.settings = {}; + } + if ((base3 = _this.local_storage.settings).show_after == null) { + base3.show_after = ""; + } + if ((base4 = _this.local_storage.settings).show_since == null) { + base4.show_since = ""; + } + if ((base5 = _this.local_storage.settings).filter_lang_list == null) { + base5.filter_lang_list = {}; + } + return _this.on_local_storage.resolve(_this.local_storage); + } + }); + }; + })(this)); + }; + ZeroMe.prototype.loadLocalStorage = function() { return this.on_site_info.then((function(_this) { return function() { _this.logStart("Loaded localstorage"); return _this.cmd("wrapperGetLocalStorage", [], function(local_storage) { - var base1, base2; + var base1, base2, base3, base4, base5; _this.local_storage = local_storage; _this.logEnd("Loaded localstorage"); if (_this.local_storage == null) { @@ -6266,6 +6766,15 @@ function clone(obj) { if ((base2 = _this.local_storage).settings == null) { base2.settings = {}; } + if ((base3 = _this.local_storage.settings).show_after == null) { + base3.show_after = ""; + } + if ((base4 = _this.local_storage.settings).show_since == null) { + base4.show_since = ""; + } + if ((base5 = _this.local_storage.settings).filter_lang_list == null) { + base5.filter_lang_list = {}; + } return _this.on_local_storage.resolve(_this.local_storage); }); }; @@ -6273,17 +6782,24 @@ function clone(obj) { }; ZeroMe.prototype.saveLocalStorage = function(cb) { - if (cb == null) { - cb = null; - } - this.logStart("Saved localstorage"); if (this.local_storage) { - return this.cmd("wrapperSetLocalStorage", this.local_storage, (function(_this) { - return function(res) { - _this.logEnd("Saved localstorage"); - return typeof cb === "function" ? cb(res) : void 0; - }; - })(this)); + if (Page.server_info.rev > 2140) { + this.logStart("Saved local settings"); + return this.cmd("userSetSettings", [this.local_storage], (function(_this) { + return function(res) { + _this.logEnd("Saved local settings"); + return typeof cb === "function" ? cb(res) : void 0; + }; + })(this)); + } else { + this.logStart("Saved localstorage"); + return this.cmd("wrapperSetLocalStorage", this.local_storage, (function(_this) { + return function(res) { + _this.logEnd("Saved localstorage"); + return typeof cb === "function" ? cb(res) : void 0; + }; + })(this)); + } } }; @@ -6350,20 +6866,29 @@ function clone(obj) { } ], (function(_this) { return function(res) { - var i, len, row; + var i, len, row, user_row; if ((res != null ? res.length : void 0) > 0) { - _this.user = new User({ - hub: res[0]["hub"], - auth_address: _this.site_info.auth_address - }); - _this.user.row = res[0]; + _this.user_hubs = {}; for (i = 0, len = res.length; i < len; i++) { row = res[i]; + _this.log("Possible site for user", row.site); + _this.user_hubs[row.site] = row; if (row.site === row.hub) { - _this.user.row = row; + user_row = row; } } - _this.log("Choosen site for user", _this.user.row.site, _this.user.row); + if (_this.user_hubs[_this.local_storage] && _this.user_hubs[_this.local_storage.settings.hub]) { + row = _this.user_hubs[_this.local_storage.settings.hub]; + _this.log("Force hub", row.site); + user_row = row; + user_row.hub = row.site; + } + _this.log("Choosen site for user", user_row.site, user_row); + _this.user = new User({ + hub: user_row.hub, + auth_address: _this.site_info.auth_address + }); + _this.user.row = user_row; _this.user.updateInfo(cb); } else { _this.user = new AnonUser(); @@ -6416,7 +6941,7 @@ function clone(obj) { params.state.url = params.href.replace(/.*\?/, ""); } this.on_loaded.resolved = false; - document.body.className = ""; + document.body.classList.remove("loaded"); window.scroll(window.pageXOffset, params.state.scrollTop || 0); return this.route(params.state.url || ""); } @@ -6498,4 +7023,4 @@ function clone(obj) { window.Page.createProjector(); -}).call(this); \ No newline at end of file +}).call(this); diff --git a/js/lib/marked.min.js b/js/lib/marked.min.js index a5164c4..041938d 100644 --- a/js/lib/marked.min.js +++ b/js/lib/marked.min.js @@ -1,6 +1,6 @@ /** * marked - a markdown parser - * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed) - * https://github.com/chjj/marked + * Copyright (c) 2011-2018, Christopher Jeffrey. (MIT Licensed) + * https://github.com/markedjs/marked */ -(function(){var block={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:noop,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:noop,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment|closed|closing) *(?:\n{2,}|\s*$)/,def:/^ *\[([^\]]+)\]: *]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:noop,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};block.bullet=/(?:[*+-]|\d+\.)/;block.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;block.item=replace(block.item,"gm")(/bull/g,block.bullet)();block.list=replace(block.list)(/bull/g,block.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+block.def.source+")")();block.blockquote=replace(block.blockquote)("def",block.def)();block._tag="(?!(?:"+"a|em|strong|small|s|cite|q|dfn|abbr|data|time|code"+"|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo"+"|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b";block.html=replace(block.html)("comment",//)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/
"+(escaped?code:escape(code,true))+"\n'+(escaped?code:escape(code,true))+"\n\n"+quote+"\n"};Renderer.prototype.html=function(html){return html};Renderer.prototype.heading=function(text,level,raw){return"
\n":"
\n"};Renderer.prototype.list=function(body,ordered){var type=ordered?"ol":"ul";return"<"+type+">\n"+body+"\n"};Renderer.prototype.listitem=function(text){return"
"+text+"
\n"};Renderer.prototype.table=function(header,body){return""+text+""};Renderer.prototype.br=function(){return this.options.xhtml?"":"
"};Renderer.prototype.del=function(text){return"
"+escape(e.message+"",true)+""}throw e}}marked.options=marked.setOptions=function(opt){merge(marked.defaults,opt);return marked};marked.defaults={gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,smartLists:false,silent:false,highlight:null,langPrefix:"lang-",smartypants:false,headerPrefix:"",renderer:new Renderer,xhtml:false};marked.Parser=Parser;marked.parser=Parser.parse;marked.Renderer=Renderer;marked.Lexer=Lexer;marked.lexer=Lexer.lex;marked.InlineLexer=InlineLexer;marked.inlineLexer=InlineLexer.output;marked.parse=marked;if(typeof module!=="undefined"&&typeof exports==="object"){module.exports=marked}else if(typeof define==="function"&&define.amd){define(function(){return marked})}else{this.marked=marked}}).call(function(){return this||(typeof window!=="undefined"?window:global)}()); \ No newline at end of file +!function(e){"use strict";var k={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:f,hr:/^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *(?:#+ *)?(?:\n+|$)/,nptable:f,blockquote:/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,list:/^( {0,3})(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:"^ {0,3}(?:<(script|pre|style)[\\s>][\\s\\S]*?(?:[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?\\?>\\n*|\\n*|\\n*|)[\\s\\S]*?(?:\\n{2,}|$)|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$)|(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$))",def:/^ {0,3}\[(label)\]: *\n? *]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,table:f,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,paragraph:/^([^\n]+(?:\n(?!hr|heading|lheading| {0,3}>|<\/?(?:tag)(?: +|\n|\/?>)|<(?:script|pre|style|!--))[^\n]+)*)/,text:/^[^\n]+/};function a(e){this.tokens=[],this.tokens.links=Object.create(null),this.options=e||b.defaults,this.rules=k.normal,this.options.pedantic?this.rules=k.pedantic:this.options.gfm&&(this.options.tables?this.rules=k.tables:this.rules=k.gfm)}k._label=/(?!\s*\])(?:\\[\[\]]|[^\[\]])+/,k._title=/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/,k.def=i(k.def).replace("label",k._label).replace("title",k._title).getRegex(),k.bullet=/(?:[*+-]|\d{1,9}\.)/,k.item=/^( *)(bull) ?[^\n]*(?:\n(?!\1bull ?)[^\n]*)*/,k.item=i(k.item,"gm").replace(/bull/g,k.bullet).getRegex(),k.list=i(k.list).replace(/bull/g,k.bullet).replace("hr","\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def","\\n+(?="+k.def.source+")").getRegex(),k._tag="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",k._comment=//,k.html=i(k.html,"i").replace("comment",k._comment).replace("tag",k._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),k.paragraph=i(k.paragraph).replace("hr",k.hr).replace("heading",k.heading).replace("lheading",k.lheading).replace("tag",k._tag).getRegex(),k.blockquote=i(k.blockquote).replace("paragraph",k.paragraph).getRegex(),k.normal=d({},k),k.gfm=d({},k.normal,{fences:/^ {0,3}(`{3,}|~{3,})([^`\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/,paragraph:/^/,heading:/^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/}),k.gfm.paragraph=i(k.paragraph).replace("(?!","(?!"+k.gfm.fences.source.replace("\\1","\\2")+"|"+k.list.source.replace("\\1","\\3")+"|").getRegex(),k.tables=d({},k.gfm,{nptable:/^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,table:/^ *\|(.+)\n *\|?( *[-:]+[-| :]*)(?:\n((?: *[^>\n ].*(?:\n|$))*)\n*|$)/}),k.pedantic=d({},k.normal,{html:i("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)|
'+(n?e:u(e,!0))+"\n":""+(n?e:u(e,!0))+"\n"+e+"\n"},r.prototype.html=function(e){return e},r.prototype.heading=function(e,t,n,r){return this.options.headerIds?"
\n":"
\n"},r.prototype.list=function(e,t,n){var r=t?"ol":"ul";return"<"+r+(t&&1!==n?' start="'+n+'"':"")+">\n"+e+"\n"},r.prototype.listitem=function(e){return"
"+e+"
\n"},r.prototype.table=function(e,t){return t&&(t=""+t+""),""+e+""},r.prototype.br=function(){return this.options.xhtml?"":"
"},r.prototype.del=function(e){return"
"+u(e.message+"",!0)+"";throw e}}f.exec=f,b.options=b.setOptions=function(e){return d(b.defaults,e),b},b.getDefaults=function(){return{baseUrl:null,breaks:!1,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:new r,sanitize:!1,sanitizer:null,silent:!1,smartLists:!1,smartypants:!1,tables:!0,xhtml:!1}},b.defaults=b.getDefaults(),b.Parser=h,b.parser=h.parse,b.Renderer=r,b.TextRenderer=s,b.Lexer=a,b.lexer=a.lex,b.InlineLexer=p,b.inlineLexer=p.output,b.Slugger=t,b.parse=b,"undefined"!=typeof module&&"object"==typeof exports?module.exports=b:"function"==typeof define&&define.amd?define(function(){return b}):e.marked=b}(this||("undefined"!=typeof window?window:global)); diff --git a/js/utils/Autosize.coffee b/js/utils/Autosize.coffee index 9fc412c..bb45d1d 100644 --- a/js/utils/Autosize.coffee +++ b/js/utils/Autosize.coffee @@ -3,12 +3,14 @@ class Autosize extends Class @node = null @attrs.classes ?= {} - @attrs.classes.loading = false - @attrs.oninput = @handleInput - @attrs.onkeydown = @handleKeydown - @attrs.afterCreate = @storeNode - @attrs.rows = 1 - @attrs.disabled = false + @attrs.classes.loading ?= false + @attrs.oninput ?= @handleInput + @attrs.onkeydown ?= @handleKeydown + @attrs.afterCreate ?= @storeNode + @attrs.rows ?= 1 + @attrs.disabled ?= false + @attrs.value ?= "" + @attrs.title_submit ?= null @property 'loading', get: -> @attrs.classes.loading @@ -49,22 +51,35 @@ class Autosize extends Class RateLimit 300, @autoHeight handleKeydown: (e=null) => - if e.which == 13 and not e.shiftKey and @attrs.onsubmit and @attrs.value.trim() - @attrs.onsubmit() - setTimeout ( => - @autoHeight() - ), 100 - return false + if e.which == 13 and e.ctrlKey and @attrs.onsubmit and @attrs.value.trim() + @submit() + + submit: => + @attrs.onsubmit() + setTimeout ( => + @autoHeight() + ), 100 + return false render: (body=null) => - if body and @attrs.value == undefined + if body and !@attrs.value @setValue(body) if @loading attrs = clone(@attrs) #attrs.value = "Submitting..." attrs.disabled = true - h("textarea.autosize", attrs) + tag_textarea = h("textarea.autosize", attrs) else - h("textarea.autosize", @attrs) + tag_textarea = h("textarea.autosize", @attrs) + + return [ + tag_textarea, + if @attrs.title_submit + h( + "a.button.button.button-submit.button-small", + {href: "#Submit", onclick: @submit, classes: @attrs.classes}, + @attrs.title_submit + ) + ] -window.Autosize = Autosize \ No newline at end of file +window.Autosize = Autosize diff --git a/js/utils/ImagePreview.coffee b/js/utils/ImagePreview.coffee index edba302..b8fc71b 100644 --- a/js/utils/ImagePreview.coffee +++ b/js/utils/ImagePreview.coffee @@ -52,18 +52,18 @@ class ImagePreview extends Class #ctx.putImageData(image_data, 1, 0) #ctx.putImageData(image_data, 0, 1) ctx.putImageData(image_data, 0, 0) - ### + + # Add some blur for more smooth image canvas2 = document.createElement("canvas") canvas2.width = width*3 canvas2.height = height*3 ctx = canvas2.getContext('2d') ctx.filter = "blur(1px)" - ctx.drawImage(canvas, 1, 0, canvas.width*3, canvas.height*3) - ctx.drawImage(canvas, 0, 1, canvas.width*3, canvas.height*3) + ctx.drawImage(canvas, -5, -5, canvas.width*3 + 10, canvas.height*3 + 10) ctx.drawImage(canvas, 0, 0, canvas.width*3, canvas.height*3) - ### - back = canvas.toDataURL("image/png") + + back = canvas2.toDataURL("image/png") @logEnd "Render" return back -window.ImagePreview = ImagePreview \ No newline at end of file +window.ImagePreview = ImagePreview diff --git a/js/utils/Menu.coffee b/js/utils/Menu.coffee index 9d81f70..80acbc4 100644 --- a/js/utils/Menu.coffee +++ b/js/utils/Menu.coffee @@ -39,7 +39,12 @@ class Menu [title, cb, selected] = item if title == e.target.textContent keep_menu = cb(item) - if keep_menu != true + # Keep Language Filter opened when selecting language + if e.target.type and (e.target.type == "everyone" or e.target.type == "lang" or e.target.type.slice(0,3) == "hub") + @hide() + else if e.target.value or e.target.title == "" + @show() + else if keep_menu != true @hide() return false @@ -56,7 +61,22 @@ class Menu else # Callback href = "#"+title onclick = @handleClick - h("a.menu-item", {href: href, onclick: onclick, key: title, classes: {"selected": selected}}, [title]) + if title == "Show posts after" + h("div.show-after", + h("a.menu-item", { + href: href, onclick: onclick, key: title}, [title]), + h("input#show-after-date", { + placeholder: "unix time", value: selected + })) + else if title == "Show posts since" + h("div.show-since", + h("a.menu-item", { + href: href, onclick: onclick, key: title}, [title]), + h("input#show-since-day", { + placeholder: " n ", value: selected + },)," days ago") + else + h("a.menu-item", {href: href, onclick: onclick, key: title, classes: {"selected": selected}}, [title]) render: (class_name="") => if @visible or @node @@ -68,6 +88,11 @@ window.Menu = Menu document.body.addEventListener "mouseup", (e) -> if not window.visible_menu or not window.visible_menu.node return false - if e.target != window.visible_menu.node.parentNode and e.target.parentNode != window.visible_menu.node and e.target.parentNode != window.visible_menu.node.parentNode and e.target.parentNode != window.visible_menu.node and e.target.parentNode.parentNode != window.visible_menu.node.parentNode + if e.target != window.visible_menu.node.parentNode and \ + e.target.parentNode != window.visible_menu.node and \ + e.target.parentNode != window.visible_menu.node.parentNode and \ + e.target.parentNode != window.visible_menu.node and \ + e.target.parentNode.parentNode != window.visible_menu.node and \ + e.target.parentNode.parentNode != window.visible_menu.node.parentNode window.visible_menu.hide() - Page.projector.scheduleRender() \ No newline at end of file + Page.projector.scheduleRender() diff --git a/js/utils/Text.coffee b/js/utils/Text.coffee index 86d8c3d..b869ef5 100644 --- a/js/utils/Text.coffee +++ b/js/utils/Text.coffee @@ -1,6 +1,6 @@ class MarkedRenderer extends marked.Renderer image: (href, title, text) -> - return ("
")
+ return ""
class Text
toColor: (text, saturation=30, lightness=50) ->
@@ -8,8 +8,10 @@ class Text
for i in [0..text.length-1]
hash += text.charCodeAt(i)*i
hash = hash % 1777
- return "hsl(" + (hash % 360) + ",#{saturation}%,#{lightness}%)";
-
+ if Page.server_info?.user_settings?.theme == "dark"
+ return "hsl(" + (hash % 360) + ",#{saturation + 5}%,#{lightness + 15}%)";
+ else
+ return "hsl(" + (hash % 360) + ",#{saturation}%,#{lightness}%)";
renderMarked: (text, options={}) =>
if not text
@@ -20,7 +22,8 @@ class Text
options["renderer"] = marked_renderer
text = @fixReply(text)
text = marked(text, options)
- text = text.replace(/(@[^\x00-\x1f^\x21-\x2f^\x3a-\x40^\x5b-\x60^\x7b-\x7f]{1,16}):/g, '$1:') # Highlight usernames
+ text = text.replace(/(.*?)<\/a>/g, '$1') # Disable email auto-convert
+ text = text.replace(/(\s|>|^)(@[^\s]{1,50}):/g, '$1$2:') # Highlight usernames
return @fixHtmlLinks text
renderLinks: (text) =>
@@ -28,7 +31,7 @@ class Text
text = text.replace /(https?:\/\/[^\s)]+)/g, (match) ->
return "#{match}" # UnSanitize & -> & in links
text = text.replace(/\n/g, '') - text = text.replace(/(@[^\x00-\x1f^\x21-\x2f^\x3a-\x40^\x5b-\x60^\x7b-\x7f]{1,16}):/g, '$1:') + text = text.replace(/(\s|>|^)(@[^\s]{1,50}):/g, '$1$2:') text = @fixHtmlLinks(text) return text @@ -43,6 +46,7 @@ class Text if window.is_proxy text = text.replace(/href="http:\/\/(127.0.0.1|localhost):43110/gi, 'href="http://zero') text = text.replace(/http:\/\/zero\/([^\/]+\.bit)/, "http://$1") + text = text.replace(/href="\/([A-Za-z0-9]{26,35})/g, 'href="http://zero/$1') # Links without 127.0.0.1 else text = text.replace(/href="http:\/\/(127.0.0.1|localhost):43110/g, 'href="') # Add no-refresh linking to local links @@ -54,7 +58,9 @@ class Text fixLink: (link) -> if window.is_proxy back = link.replace(/http:\/\/(127.0.0.1|localhost):43110/, 'http://zero') - return back.replace(/http:\/\/zero\/([^\/]+\.bit)/, "http://$1") # Domain links + back = back.replace(/http:\/\/zero\/([^\/]+\.bit)/, "http://$1") # Domain links + back = back.replace(/\/([A-Za-z0-9]{26,35})/, "http://zero/$1") # Links without 127.0.0.1 + return back else return link.replace(/http:\/\/(127.0.0.1|localhost):43110/, '') diff --git a/languages/it.json b/languages/it.json index abf553c..d76b33e 100644 --- a/languages/it.json +++ b/languages/it.json @@ -11,44 +11,44 @@ "Unfollow": "Smetti di seguire", "Help distribute this user's images": "Aiuta a distribuire le immagini di questo utente", "Following": "Seguendo", - "Activity feed": "Feed di attività", + "Activity feed": "Note dell'attività", "Show more...": "Mostra ancora...", - "Mute ": "Silenzia questo utente", + "Mute ": "Silenzia ", " started following ": " iniziato a seguire: ", " commented on ": " commentato su ", " liked ": " approva ", "'s ": " ", "_(post, like post)": "_(messaggio, approva messaggio)", - "_(post, comment post)": "_(messaggio, messaggio commento)", + "_(post, comment post)": "_(messaggio, commenta messaggio)", "Cancel": "Annulla", "Save": "Salva", "Delete": "Cancella", - "User's profile site not loaded to your client yet.": "Il sito del profilo dell'utente non è ancora stato caricato sul tuo client.", + "User's profile site not loaded to your client yet.": "Il sito dell'utente non è ancora stato caricato sul tuo client.", "Download user's site": "Scarica il sito dell'utente", "Browse all \\u203A": "Naviga tutti \\u203A", "New users": "Nuovi utenti", - "Suggested users": "Usenti suggeriti", + "Suggested users": "Utenti suggeriti", "Create new profile": "Crea nuovo profilo", "Creating new profile...": "Creazione nuovo profilo...", "Checking user on selected hub...": "Controllo utente sull'hub selezionato...", - "User \" + Page.site_info.cert_user_id + \" already exists on this hub": "Utente \" + Page.site_info.cert_user_id + \" esiste già su questo hub", + "User \" + Page.site_info.cert_user_id + \" already exists on this hub": "L'utente \" + Page.site_info.cert_user_id + \" esiste già su questo hub", "Select ID...": "Seleziona ID ...", "Seeded HUBs": "HUB mantenuti", "Available HUBs": "HUB disponibili", "(With this you choose where is your profile stored. There is no difference on content and you will able to reach all users from any hub)": - "(Con questo tu scegli dove il tuo profilo è salvato. Non c'è differenza sul contenuto, e sarai in grado di raggiungere tutti gli utenti in ogni hub)", + "(Con questo si sceglie dove salvare il profilo. Non c'è differenza sul contenuto e sarai in grado di raggiungere tutti gli utenti da ogni hub)", "Random ZeroNet user": "Utente ZeroNet casuale", "Hello ZeroMe!": "Ciao ZeroMe!", "Loading...\\nShow image": "Caricamento...\\nMostra immagine", "Help distribute this user's new images": "Aiuta a distribuire le nuove immagini di questo utente", - "Delete image": "Cancella immagina", + "Delete image": "Cancella immagine", "Show image": "Mostra immagine", "'s new images": " nuove immagini", @@ -59,14 +59,14 @@ "Everyone": "Tutti", "Followed users": "Utenti seguiti", "Show more posts...": "Mostra altri messaggi...", - "Show more comments...": "Mostra altri contenuti...", + "Show more comments...": "Mostra altri commenti...", "No posts yet": "Ancora nessun messaggio", "Let's follow some users!": "Inizia a seguire alcuni utenti!", - "Select user to post new content": "Seleziona utente per mettere nuovo contenuto", + "Select user to post new content": "Seleziona un utente per inserire nuovo contenuto", "Write something...": "Scrivi qualcosa...", "Submit new post": "Invia nuovo messaggio", - "Invalid image, only jpg format supported": "Immagine non valida, supportato solo formato jpg", + "Invalid image, only jpg format supported": "Immagine non valida, supportato solo il formato jpg", "Follow in newsfeed": "Segui il feed delle novità", @@ -77,6 +77,6 @@ " minutes ago": " minuti fa", " hours ago": " ore fa", " days ago": " giorni fa", - "on ": "a", - "Just now": "Proprio ora" + "on ": "a ", + "Just now": "Adesso" } diff --git a/languages/sk.json b/languages/sk.json new file mode 100644 index 0000000..9644a74 --- /dev/null +++ b/languages/sk.json @@ -0,0 +1,83 @@ +{ + "Visitor": "Návštevník", + "Select your account": "Zvoľte svoj účet", + "You need a profile for this feature": "Pre túto funkciu potrebujete profil", + + "Follow username mentions": "Sledovať spomenutia používateľského mena", + "Follow comments on your posts": "Sledovať komentáre na vaších príspevkoch", + "Follow new followers": "Sledovať nových sledovateľov", + + "Follow": "Sledovať", + "Unfollow": "Prestať sledovať", + "Help distribute this user's images": "Pomôcť s distribúciou obrázkov tohto používateľa", + "Following": "Sledované", + "Activity feed": "Prehľad aktivít", + "Show more...": "Viac...", + + " started following ": " začal sledovať ", + " commented on ": " komentoval na ", + " liked ": " like-ol ", + "'s ": "", + "_(post, like post)": "_(post, like-núť post)", + "_(post, comment post)": "_(post, komentovať post)", + + "Cancel": "Zrušiť", + "Save": "Uložiť", + "Delete": "Vymazať", + + "User's profile site not loaded to your client yet.": "Stránka používateľského účtu ešte nebola načítaná do vašeho klinta.", + "Download user's site": "Stiahnuť stránku používateľa", + + "Browse all \\u203A": "Prezrieť všetko \\u203A", + "New users": "Nový používatelia", + "Suggested users": "Doporučený používatelia", + + "Create new profile": "Vytvoriť nový profil", + "Creating new profile...": "Vytvára sa nový profil...", + "Checking user on selected hub...": "Kontroluje sa používateľ na zvolenom hub-e...", + "User \" + Page.site_info.cert_user_id + \" already exists on this hub": "Používateľ \" + Page.site_info.cert_user_id + \" už na tomto hub-e existuje", + "Select ID...": "Zvoliť ID...", + "Seeded HUBs": "Seed-ovaných Hub-ov", + "Available HUBs": "Dostupných Hub-ov", + "(With this you choose where is your profile stored. There is no difference on content and you will able to reach all users from any hub)": + "(S týmto si zvolíš kde bude tvoj profil uložený. Žiadny rozdiel medzi obsahom nieje a budeš vidieť všetkých používateľov z ostatných hub-ov)", + + "Random ZeroNet user": "Náhodný ZeroNet používateľ", + "Hello ZeroMe!": "Ahoj ZeroMe!", + + "Loading...\\nShow image": "Načítava sa...\\nUkázať Obrázok", + "Help distribute this user's new images": "Pomôcť s distribúciou obrázkov tohto používateľa", + "Delete image": "Vymazať obrázok", + "Show image": "Ukázať obrázok", + "'s new images": " nových obrázkov", + + "Comment": "Komentovať", + "Add your comment": "Pridaj svoj komentár", + "Reply": "Odpovedať", + + "Everyone": "Všetci", + "Followed users": "Sledovaný používatelia", + "Show more posts...": "Ukázať viac postov...", + "Show more comments...": "Ukázať viac komentárov...", + "No posts yet": "Zatiaľ žiadne príspevky", + "Let's follow some users!": "Začnite sledovať nejakých používateľov!", + + "Select user to post new content": "Zvoľte používateľa za ktorého chcete uverejniť obsah", + "Write something...": "Napíšte niečo...", + "Submit new post": "Zaslať nový príspevok", + "Invalid image, only jpg format supported": "Neplatný obrázok, podporovaný iba jpg formát", + + "Follow in newsfeed": "Sledovať v novinkách", + + "New users in ZeroMe": "Nový používatelia na ZeroMe", + "Total: ": "Ceľkom: ", + " registered users": " registrovaných používateľov", + + " minutes ago": " minút dozadu", + " hours ago": " hodín dozadu", + " days ago": " dní dozadu", + "on ": "", + "Just now": "Teraz", + "Liked": "Like-nuté", + "Followed by ": "Sledovaný/á používateľom " +}