Merge branch 'editing', split darkmode to own file
This commit is contained in:
+36
-1
@@ -88,10 +88,45 @@ function old_json($name, $default) {
|
||||
}
|
||||
|
||||
// Safe JSON funcs
|
||||
function toJSON($object) {
|
||||
function toJSON($object, $emptyObj=false) {
|
||||
if ($emptyObj) {
|
||||
if ((empty($object) || ($object instanceof \Illuminate\Support\Collection && $object->count()==0))) {
|
||||
return '{}';
|
||||
}
|
||||
}
|
||||
|
||||
if (!$object instanceof JsonSerializable && $object instanceof \Illuminate\Contracts\Support\Arrayable) {
|
||||
$object = $object->toArray();
|
||||
}
|
||||
|
||||
return \GuzzleHttp\json_encode($object, JSON_UNESCAPED_SLASHES + JSON_UNESCAPED_UNICODE);
|
||||
}
|
||||
|
||||
function fromJSON($object, $assoc=false) {
|
||||
return \GuzzleHttp\json_decode($object, $assoc);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param \Illuminate\Support\Collection|array $items
|
||||
* @param int $per_page
|
||||
* @param null|\Closure $mapFn
|
||||
* @return \Illuminate\Pagination\LengthAwarePaginator
|
||||
*/
|
||||
function collection_paginate($items, $per_page, $mapFn = null)
|
||||
{
|
||||
if (!$items instanceof \Illuminate\Support\Collection) {
|
||||
$items = collect($items);
|
||||
}
|
||||
|
||||
$page = Request::get('page', 1);
|
||||
|
||||
$pageItems = $items->forPage($page, $per_page)->values();
|
||||
|
||||
return new Illuminate\Pagination\LengthAwarePaginator(
|
||||
$mapFn ? $pageItems->map($mapFn) : $pageItems,
|
||||
$items->count(),
|
||||
$per_page,
|
||||
Illuminate\Pagination\Paginator::resolveCurrentPage(),
|
||||
['path' => Illuminate\Pagination\Paginator::resolveCurrentPath()]
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user