diff -r 803dbeb7c919 -r f0873867143a client/js/main.js --- a/client/js/main.js Wed Feb 27 19:04:36 2013 +0100 +++ b/client/js/main.js Thu Feb 28 19:13:08 2013 +0100 @@ -28,7 +28,14 @@ Rkns.VERSION = '0.2'; -Rkns.pickerColors = ["#8f1919", "#a80000", "#d82626", "#ff0000", "#e87c7c", "#ff6565", "#f7d3d3", "#fecccc", "#8f5419", "#a85400", "#d87f26", "#ff7f00", "#e8b27c", "#ffb265", "#f7e5d3", "#fee5cc", "#8f8f19", "#a8a800", "#d8d826", "#feff00", "#e8e87c", "#feff65", "#f7f7d3", "#fefecc", "#198f19", "#00a800", "#26d826", "#00ff00", "#7ce87c", "#65ff65", "#d3f7d3", "#ccfecc", "#198f8f", "#00a8a8", "#26d8d8", "#00feff", "#7ce8e8", "#65feff", "#d3f7f7", "#ccfefe", "#19198f", "#0000a8", "#2626d8", "#0000ff", "#7c7ce8", "#6565ff", "#d3d3f7", "#ccccfe", "#8f198f", "#a800a8", "#d826d8", "#ff00fe", "#e87ce8", "#ff65fe", "#f7d3f7", "#feccfe", "#000000", "#242424", "#484848", "#6d6d6d", "#919191", "#b6b6b6", "#dadada", "#ffffff"]; +Rkns.pickerColors = ["#8f1919", "#a80000", "#d82626", "#ff0000", "#e87c7c", "#ff6565", "#f7d3d3", "#fecccc", + "#8f5419", "#a85400", "#d87f26", "#ff7f00", "#e8b27c", "#ffb265", "#f7e5d3", "#fee5cc", + "#8f8f19", "#a8a800", "#d8d826", "#feff00", "#e8e87c", "#feff65", "#f7f7d3", "#fefecc", + "#198f19", "#00a800", "#26d826", "#00ff00", "#7ce87c", "#65ff65", "#d3f7d3", "#ccfecc", + "#198f8f", "#00a8a8", "#26d8d8", "#00feff", "#7ce8e8", "#65feff", "#d3f7f7", "#ccfefe", + "#19198f", "#0000a8", "#2626d8", "#0000ff", "#7c7ce8", "#6565ff", "#d3d3f7", "#ccccfe", + "#8f198f", "#a800a8", "#d826d8", "#ff00fe", "#e87ce8", "#ff65fe", "#f7d3f7", "#feccfe", + "#000000", "#242424", "#484848", "#6d6d6d", "#919191", "#b6b6b6", "#dadada", "#ffffff"]; Rkns._BaseBin = function(_renkan, _opts) { if (typeof _renkan !== "undefined") { @@ -122,12 +129,26 @@ }); }); } + if (typeof _opts.bookmarklet_url !== "string") { + _opts.bookmarklet_url = "js/bookmarklet.js"; + } this.project = new Rkns.Models.Project(); this.language = _opts.language; this.static_url = _opts.static_url; this.show_bins = _opts.show_bins; this.read_only = _opts.read_only; this.properties = _opts.properties; + + function getAbsoluteURL(url) { + var tmp = document.createElement('img'); + tmp.src = url; + var res = tmp.src; + tmp.src = null; + return res; + } + + this.bookmarklet_url = getAbsoluteURL(_opts.bookmarklet_url); + this.translate = function(_text) { return (Rkns.i18n[_opts.language] || Rkns.i18n[_opts.language.substr(0,2)] || {})[_text] || _text; } @@ -230,7 +251,7 @@ } Rkns.Renkan.prototype.template = Rkns._.template( - '<% if (show_bins) { %>

<%- translate("Renkan") %>

' + '<% if (show_bins) { %>

<%- translate("Select contents:")%>

' + '
" />' + '
    ' + '
    '