diff options
| author | friendica <info@friendica.com> | 2014-12-21 14:45:46 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-21 14:45:46 -0800 |
| commit | b840c279957667168b400207caff14dc78043994 (patch) | |
| tree | ece0b11af5e7055226c566e4aa35ef4a7a781de0 /view/js | |
| parent | 2b3cc585a24cbdf97e8e2382752297bc4f725e12 (diff) | |
| parent | c732b72a0dde2c8b4d49e63114c9415f44a8a8d7 (diff) | |
| download | volse-hubzilla-b840c279957667168b400207caff14dc78043994.tar.gz volse-hubzilla-b840c279957667168b400207caff14dc78043994.tar.bz2 volse-hubzilla-b840c279957667168b400207caff14dc78043994.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/autocomplete.js | 4 | ||||
| -rw-r--r-- | view/js/main.js | 12 | ||||
| -rw-r--r-- | view/js/mod_filestorage.js | 1 |
3 files changed, 15 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],{}); }; 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'); + }); |