From c2b84f73852a728ccadd7a9b58ec693b81ba65db Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sun, 21 Dec 2014 10:49:45 +0100 Subject: Correct domain for smily requests --- view/js/autocomplete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/js') diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index fa293fdfd..7e6fc44ab 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -50,7 +50,7 @@ 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'] + ' '; }, } -- cgit v1.2.3 From af28b332148087c83501bf37a376c73b5fd357cb Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sun, 21 Dec 2014 14:36:46 +0100 Subject: Fix whitespace disappearing at the beginning of completed smily --- view/js/autocomplete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/js') diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 7e6fc44ab..e62959a6c 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -52,7 +52,7 @@ function replace(item) { index: 2, 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],{}); }; -- cgit v1.2.3 From 27d786c979a07eddaa31a9f8fe291360b586b9cf Mon Sep 17 00:00:00 2001 From: marijus Date: Sun, 21 Dec 2014 20:11:30 +0100 Subject: files: make mod/filestorage.php load via ajax and some design work. work in progress... --- view/js/main.js | 12 ++++++++++++ view/js/mod_filestorage.js | 1 + 2 files changed, 13 insertions(+) (limited to 'view/js') diff --git a/view/js/main.js b/view/js/main.js index a851e7e63..f49cea78c 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -208,6 +208,7 @@ var pageHasMoreContent = true; var updateCountsOnly = false; var divmore_height = 400; + var last_filestorage_id = null; $(function() { $.ajaxSetup({cache: false}); @@ -842,6 +843,17 @@ function updateConvItems(mode,data) { }); } + function filestorage(event,nick,id) { + $('#perms-panel-' + last_filestorage_id).html(''); + $('#file-edit-' + id).spin('tiny'); + delete acl; + $.get('filestorage/' + nick + '/' + id + '/edit', function(data) { + $('#perms-panel-' + id).html(data); + $('#file-edit-' + id).spin(false); + last_filestorage_id = id; + }); + } + function post_comment(id) { unpause(); commentBusy = true; diff --git a/view/js/mod_filestorage.js b/view/js/mod_filestorage.js index 88c1cf7d8..bee37767f 100644 --- a/view/js/mod_filestorage.js +++ b/view/js/mod_filestorage.js @@ -13,4 +13,5 @@ $(document).ready(function() { } }).trigger('change'); + }); -- cgit v1.2.3