mirror of
https://git.sekbaer.de/Friendica/friendica.git
synced 2025-06-12 01:54:26 +02:00
Merge develop into 20170321_-_frio-fbbrowser
Conflicts: view/theme/frio/js/filebrowser.js view/theme/frio/js/theme.js view/theme/frio/templates/filebrowser.tpl view/theme/frio/templates/jot.tpl
This commit is contained in:
commit
ee293f2ce2
557 changed files with 14085 additions and 34536 deletions
|
@ -618,6 +618,27 @@ function htmlToText(htmlString) {
|
|||
return text;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sends a /like API call and updates the display of the relevant action button
|
||||
* before the update reloads the item.
|
||||
*
|
||||
* @param {string} ident The id of the relevant item
|
||||
* @param {string} verb The verb of the action
|
||||
* @returns {undefined}
|
||||
*/
|
||||
function doLikeAction(ident, verb) {
|
||||
unpause();
|
||||
|
||||
if (verb.indexOf('attend') === 0) {
|
||||
$('.item-' + ident + ' .button-event:not(#' + verb + '-' + ident + ')').removeClass('active');
|
||||
}
|
||||
$('#' + verb + '-' + ident).toggleClass('active');
|
||||
$('#like-rotator-' + ident.toString()).show();
|
||||
$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
|
||||
liking = 1;
|
||||
force_update = true;
|
||||
}
|
||||
|
||||
// Decodes a hexadecimally encoded binary string
|
||||
function hex2bin (s) {
|
||||
// discuss at: http://locutus.io/php/hex2bin/
|
||||
|
@ -666,4 +687,4 @@ function bin2hex (s) {
|
|||
}
|
||||
|
||||
return o;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue