aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-12-22 09:43:57 +1100
committerRedMatrix <info@friendica.com>2014-12-22 09:43:57 +1100
commit143cb8ed3b9d454d543838a744a6af2c3778a0e5 (patch)
treef21aad59e3d5821d794f74e7469982356c468c7c
parent0c98cacbcf0c27aba6bea62b4bf3dc00c91b3962 (diff)
parentaf28b332148087c83501bf37a376c73b5fd357cb (diff)
downloadvolse-hubzilla-143cb8ed3b9d454d543838a744a6af2c3778a0e5.tar.gz
volse-hubzilla-143cb8ed3b9d454d543838a744a6af2c3778a0e5.tar.bz2
volse-hubzilla-143cb8ed3b9d454d543838a744a6af2c3778a0e5.zip
Merge pull request #753 from pafcu/autocomplete
Correct domain for smily requests
-rw-r--r--view/js/autocomplete.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index fa293fdfd..e62959a6c 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -50,9 +50,9 @@ function replace(item) {
smilies = {
match: /(^|\s)(:[a-z]{2,})$/,
index: 2,
- search: function(term, callback) { $.getJSON('https://caterva.eu/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry['text'].indexOf(term) === 0 ? entry : null })) }) },
+ search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry['text'].indexOf(term) === 0 ? entry : null })) }) },
template: function(item) { return item['icon'] + item['text'] },
- replace: function(item) { return item['text'] + ' '; },
+ replace: function(item) { return "$1"+item['text'] + ' '; },
}
this.textcomplete([contacts,smilies],{});
};