mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-09 16:24:51 +00:00
Merge pull request #3453 from shleeable/staging-unwanted-semicolons
unwanted semicolons
This commit is contained in:
commit
7d26f4ef2e
9 changed files with 13 additions and 13 deletions
|
@ -208,7 +208,7 @@ class SettingsController extends Controller
|
||||||
$opencollective = Str::startsWith($opencollective, 'opencollective.com/') ? e($opencollective) : null;
|
$opencollective = Str::startsWith($opencollective, 'opencollective.com/') ? e($opencollective) : null;
|
||||||
|
|
||||||
if(empty($patreon) && empty($liberapay) && empty($opencollective)) {
|
if(empty($patreon) && empty($liberapay) && empty($opencollective)) {
|
||||||
return redirect(route('settings'))->with('error', 'An error occured. Please try again later.');;
|
return redirect(route('settings'))->with('error', 'An error occured. Please try again later.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$res = [
|
$res = [
|
||||||
|
@ -251,7 +251,7 @@ class SettingsController extends Controller
|
||||||
} else {
|
} else {
|
||||||
Redis::zrem('pf:tl:replies', $pid);
|
Redis::zrem('pf:tl:replies', $pid);
|
||||||
}
|
}
|
||||||
return redirect(route('settings'))->with('status', 'Timeline settings successfully updated!');;
|
return redirect(route('settings'))->with('status', 'Timeline settings successfully updated!');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function mediaSettings(Request $request)
|
public function mediaSettings(Request $request)
|
||||||
|
|
|
@ -22,7 +22,7 @@ class HashidService {
|
||||||
while($id) {
|
while($id) {
|
||||||
$id = ($id - ($r = $id % $base)) / $base;
|
$id = ($id - ($r = $id % $base)) / $base;
|
||||||
$shortcode = $cmap[$r] . $shortcode;
|
$shortcode = $cmap[$r] . $shortcode;
|
||||||
};
|
}
|
||||||
return $shortcode;
|
return $shortcode;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -1503,7 +1503,7 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
locationSearch(input) {
|
locationSearch(input) {
|
||||||
if (input.length < 1) { return []; };
|
if (input.length < 1) { return []; }
|
||||||
let results = [];
|
let results = [];
|
||||||
return axios.get('/api/compose/v0/search/location', {
|
return axios.get('/api/compose/v0/search/location', {
|
||||||
params: {
|
params: {
|
||||||
|
@ -1650,7 +1650,7 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
tagSearch(input) {
|
tagSearch(input) {
|
||||||
if (input.length < 1) { return []; };
|
if (input.length < 1) { return []; }
|
||||||
let self = this;
|
let self = this;
|
||||||
let results = [];
|
let results = [];
|
||||||
return axios.get('/api/compose/v0/search/tag', {
|
return axios.get('/api/compose/v0/search/tag', {
|
||||||
|
|
|
@ -305,7 +305,7 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
composeSearch(input) {
|
composeSearch(input) {
|
||||||
if (input.length < 1) { return []; };
|
if (input.length < 1) { return []; }
|
||||||
let self = this;
|
let self = this;
|
||||||
let results = [];
|
let results = [];
|
||||||
return axios.post('/api/direct/lookup', {
|
return axios.post('/api/direct/lookup', {
|
||||||
|
|
2
resources/assets/js/lib/argon.js
vendored
2
resources/assets/js/lib/argon.js
vendored
|
@ -880,7 +880,7 @@ var UsersChart = (function() {
|
||||||
|
|
||||||
$chart.data('chart', usersChart);
|
$chart.data('chart', usersChart);
|
||||||
|
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|
||||||
// Events
|
// Events
|
||||||
|
|
|
@ -21,8 +21,8 @@ return [
|
||||||
'blockingAccounts' => 'Blokování účtů',
|
'blockingAccounts' => 'Blokování účtů',
|
||||||
'safetyTips' => 'Tipy pro bezpečnost',
|
'safetyTips' => 'Tipy pro bezpečnost',
|
||||||
'reportSomething' => 'Nahlašování',
|
'reportSomething' => 'Nahlašování',
|
||||||
'dataPolicy' => 'Politika dat'
|
'dataPolicy' => 'Politika dat',
|
||||||
|
|
||||||
'taggingPeople' => 'Označování lidí'
|
'taggingPeople' => 'Označování lidí'
|
||||||
|
|
||||||
];
|
]
|
||||||
|
|
|
@ -261,7 +261,7 @@
|
||||||
}
|
}
|
||||||
if($(this).hasClass('row-check-all')) {
|
if($(this).hasClass('row-check-all')) {
|
||||||
return;
|
return;
|
||||||
};
|
}
|
||||||
if(el.checked == true) {
|
if(el.checked == true) {
|
||||||
$(this).parents().eq(2).addClass('user-row-active');
|
$(this).parents().eq(2).addClass('user-row-active');
|
||||||
$('.bulk-actions').removeClass('d-none');
|
$('.bulk-actions').removeClass('d-none');
|
||||||
|
|
|
@ -68,7 +68,7 @@
|
||||||
swal.stopLoading();
|
swal.stopLoading();
|
||||||
swal.close();
|
swal.close();
|
||||||
return;
|
return;
|
||||||
};
|
}
|
||||||
let msg = 'The URL you have entered is not valid, please try again.'
|
let msg = 'The URL you have entered is not valid, please try again.'
|
||||||
try {
|
try {
|
||||||
let validator = new URL(val);
|
let validator = new URL(val);
|
||||||
|
@ -77,7 +77,7 @@
|
||||||
swal.close();
|
swal.close();
|
||||||
swal('Invalid URL', msg, 'error');
|
swal('Invalid URL', msg, 'error');
|
||||||
return;
|
return;
|
||||||
};
|
}
|
||||||
axios.post(window.location.href, {
|
axios.post(window.location.href, {
|
||||||
domain: validator.href
|
domain: validator.href
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
|
|
|
@ -82,7 +82,7 @@ $(document).ready(function() {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue