clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7884 from MrPetovan/bug/7834-ignore-reload 

Restore post reload after (un)ignore
This commit is contained in:
Philipp 2019-12-02 09:40:31 +01:00 committed by GitHub
parent 632095a7ec d01d69b9e7
commit 6531819971
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/System.php
View File

@ -149,7 +149,7 @@ class System extends BaseObject
* and adds an application/json HTTP header to the output. * and adds an application/json HTTP header to the output.
* After finishing the process is getting killed. * After finishing the process is getting killed.
* *
* @param array $x The input content. * @param mixed $x The input content.
* @param string $content_type Type of the input (Default: 'application/json'). * @param string $content_type Type of the input (Default: 'application/json').
*/ */
public static function jsonExit($x, $content_type = 'application/json') { public static function jsonExit($x, $content_type = 'application/json') {

2
src/Module/Item/Ignore.php
View File

@ -73,6 +73,6 @@ class Ignore extends BaseModule
} }
// the json doesn't really matter, it will either be 0 or 1 // the json doesn't really matter, it will either be 0 or 1
System::jsonExit([$ignored]); System::jsonExit($ignored);
} }
} }

12
view/js/main.js
View File

@ -649,14 +649,16 @@ function doignore(ident) {
ident = ident.toString(); ident = ident.toString();
$('#like-rotator-' + ident).show(); $('#like-rotator-' + ident).show();
$.get('item/ignore/' + ident, function(data) { $.get('item/ignore/' + ident, function(data) {
if (data.match(/1/)) { if (data === 1) {
$('#ignored-' + ident).addClass('ignored'); $('#ignored-' + ident)
$('#ignored-' + ident).removeClass('unignored'); .addClass('ignored')
.removeClass('unignored');
$('#ignore-' + ident).addClass('hidden'); $('#ignore-' + ident).addClass('hidden');
$('#unignore-' + ident).removeClass('hidden'); $('#unignore-' + ident).removeClass('hidden');
} else { } else {
$('#ignored-' + ident).addClass('unignored'); $('#ignored-' + ident)
$('#ignored-' + ident).removeClass('ignored'); .addClass('unignored')
.removeClass('ignored');
$('#ignore-' + ident).removeClass('hidden'); $('#ignore-' + ident).removeClass('hidden');
$('#unignore-' + ident).addClass('hidden'); $('#unignore-' + ident).addClass('hidden');
} }