diff options
Diffstat (limited to 'public/assets/js/util/format.js')
| -rw-r--r-- | public/assets/js/util/format.js | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/public/assets/js/util/format.js b/public/assets/js/util/format.js index 272efaf..a5891ff 100644 --- a/public/assets/js/util/format.js +++ b/public/assets/js/util/format.js @@ -177,14 +177,14 @@ function tidy_urls (s, short_urls) { return line } return line.replace(/https?:\/\/[^ ]+/g, function(url){ - if (url.match(/(gif|jpe?g|png)\?.*$/) { + if (is_image(url)) { return '<a href="' + url + '" target="_blank"><img src="' + url + '"></a>' } else if (short_urls) { return '<a href="' + url + '" target="_blank">[' + get_domain(url) + ']</a>' } else { - return '<a href="' + url + '" target="_blank">' + str + '</a>' + return '<a href="' + url + '" target="_blank">' + url + '</a>' } }); @@ -193,4 +193,24 @@ function tidy_urls (s, short_urls) { } function get_domain(url){ return url.replace(/https?:\/\//,"").replace(/\/.*/,"").replace(/www\./, "") +} +function is_image(url){ + return !! url.match(/(gif|jpe?g|png)\??.*$/i) +} +function make_link(file){ + if (file.filename.indexOf("http") !== 0) { + return "//carbonpictures.com/bucky/data/" + file.thread + "/" + file.filename + } + else { + return file.filename + } +} +function make_thumb(file){ + if (file.filename.indexOf("http") !== 0) { + return "//carbonpictures.com/bucky/data/" + file.thread + "/.thumb/t." + file.filename.toLowerCase() + } + else { + var partz = file.filename.toLowerCase().split("/") + return partz.splice(partz.length-2, 0, ".thumb").join("/") + } }
\ No newline at end of file |