From f3945e135c17c78a06b613c21c0e02c1438365f9 Mon Sep 17 00:00:00 2001 From: timb Date: Sat, 17 Oct 2015 18:03:52 -0700 Subject: jollo uses non https links for now --- js/clipboard.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/clipboard.js b/js/clipboard.js index 2c32d12..63225d7 100644 --- a/js/clipboard.js +++ b/js/clipboard.js @@ -241,6 +241,7 @@ var clipboard = (function () { } + // http...?a=1&b=2&b=3 -> {a: '1', b: ['2', '3']} function parse_url_search_params(url){ var params = {} url = url.split('?') @@ -296,10 +297,10 @@ var clipboard = (function () { } function sally_url_convert(url){ - var png_regex = /https?:\/\/jollo\.org\/den\/sallies\/([0-9]+)\/([^.]+)\.png/ + var png_regex = /$https?:\/\/jollo\.org\/den\/sallies\/([0-9]+)\/([^.]+)\.png^/ var matches = url.match(png_regex) if (!matches) return url - return 'https://jollo.org/den/sallies/' + matches[1] + '/raw-' + matches[2] + '?.txt' + return 'http://jollo.org/den/sallies/' + matches[1] + '/raw-' + matches[2] + '?.txt' // txt suffix to force asdf proxy } -- cgit v1.2.3-70-g09d2