mirror of
https://github.com/friendica/friendica
synced 2024-12-07 03:32:05 +01:00
Remove deprecated App::is_mobile/is_tablet - replace with DI::mode()->isMobile()/isTablet()
This commit is contained in:
parent
c7230932d6
commit
26af2feee2
8 changed files with 10 additions and 16 deletions
|
@ -15,6 +15,7 @@ use Friendica\Core\PConfig;
|
|||
use Friendica\Core\Renderer;
|
||||
use Friendica\Core\Session;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\DI;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Model\User;
|
||||
|
||||
|
@ -136,7 +137,7 @@ function community_content(App $a, $update = 0)
|
|||
}
|
||||
|
||||
// check if we serve a mobile device and get the user settings accordingly
|
||||
if ($a->is_mobile) {
|
||||
if (DI::mode()->isMobile()) {
|
||||
$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network', 20);
|
||||
} else {
|
||||
$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network', 40);
|
||||
|
|
|
@ -228,7 +228,7 @@ function networkPager(App $a, Pager $pager, $update)
|
|||
|
||||
// check if we serve a mobile device and get the user settings
|
||||
// accordingly
|
||||
if ($a->is_mobile) {
|
||||
if (DI::mode()->isMobile()) {
|
||||
$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network');
|
||||
$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
|
||||
} else {
|
||||
|
|
|
@ -66,10 +66,6 @@ class App
|
|||
public $timezone;
|
||||
public $interactive = true;
|
||||
public $identities;
|
||||
/** @deprecated 2019.09 - Use App\Mode->isMobile() instead */
|
||||
public $is_mobile;
|
||||
/** @deprecated 2019.09 - Use App\Mode->isTable() instead */
|
||||
public $is_tablet;
|
||||
public $theme_info = [];
|
||||
public $category;
|
||||
// Allow themes to control internal parameters
|
||||
|
@ -183,9 +179,6 @@ class App
|
|||
$this->module = $module->getName();
|
||||
$this->page = $page;
|
||||
|
||||
$this->is_mobile = $mode->isMobile();
|
||||
$this->is_tablet = $mode->isTablet();
|
||||
|
||||
$this->load();
|
||||
}
|
||||
|
||||
|
|
|
@ -571,7 +571,7 @@ class Profile
|
|||
$a = \get_app();
|
||||
$o = '';
|
||||
|
||||
if (!local_user() || $a->is_mobile || $a->is_tablet) {
|
||||
if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) {
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
@ -668,7 +668,7 @@ class Profile
|
|||
$a = \get_app();
|
||||
$o = '';
|
||||
|
||||
if (!local_user() || $a->is_mobile || $a->is_tablet) {
|
||||
if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) {
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
|
@ -290,7 +290,7 @@ class Profile extends BaseModule
|
|||
|
||||
// check if we serve a mobile device and get the user settings
|
||||
// accordingly
|
||||
if ($a->is_mobile) {
|
||||
if (DI::mode()->isMobile()) {
|
||||
$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network', 10);
|
||||
} else {
|
||||
$itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network', 20);
|
||||
|
|
|
@ -22,7 +22,7 @@ if (!isset($minimal)) {
|
|||
|
||||
$basepath = DI::baseUrl()->getUrlPath() ? "/" . DI::baseUrl()->getUrlPath() . "/" : "/";
|
||||
$frio = "view/theme/frio";
|
||||
$view_mode_class = ($a->is_mobile || $a->is_tablet) ? 'mobile-view' : 'desktop-view';
|
||||
$view_mode_class = (DI::mode()->isMobile() || DI::mode()->isMobile()) ? 'mobile-view' : 'desktop-view';
|
||||
$is_singleuser = Config::get('system', 'singleuser');
|
||||
$is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
|
||||
?>
|
||||
|
|
|
@ -35,7 +35,7 @@ function frio_init(App $a)
|
|||
|
||||
// if the device is a mobile device set js is_mobile
|
||||
// variable so the js scripts can use this information
|
||||
if ($a->is_mobile || $a->is_tablet) {
|
||||
if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script type="text/javascript">
|
||||
var is_mobile = 1;
|
||||
|
|
|
@ -36,7 +36,7 @@ function vier_init(App $a)
|
|||
$a->page['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
|
||||
}
|
||||
|
||||
if ($a->is_mobile || $a->is_tablet) {
|
||||
if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
|
||||
$a->page['htmlhead'] .= '<meta name=viewport content="width=device-width, initial-scale=1">'."\n";
|
||||
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="view/theme/vier/mobile.css" media="screen"/>'."\n";
|
||||
}
|
||||
|
@ -64,7 +64,7 @@ function cmtBbClose(id) {
|
|||
</script>
|
||||
EOT;
|
||||
|
||||
if ($a->is_mobile || $a->is_tablet) {
|
||||
if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
|
Loading…
Reference in a new issue