mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity

Enh: Added option to disable PWA/ServiceWorker Support (#4796)

Browse Source
This commit is contained in:
Lucas Bartholemy 2021-01-25 15:17:45 +01:00 committed by GitHub
parent a337048f0b
commit 9f1885dbe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG_DEV.md
View File

@ -34,3 +34,4 @@
- Enh #4416: Added replay to sub comments
- Enh #4571: humhub/libs/Html::containerLink() now adds a "data-guid" attribute
- Enh #4787: Always enable Space Membership Web Notifications
- Enh #4796: Added option to disable PWA/ServiceWorker support

7
protected/humhub/modules/web/Module.php
View File

@ -21,7 +21,6 @@ use humhub\modules\web\pwa\controllers\ServiceWorkerController;
*/
class Module extends \humhub\components\Module
{
/**
* @inheritdoc
*/
@ -32,6 +31,12 @@ class Module extends \humhub\components\Module
*/
public $security;
/**
* @since 1.8
* @var boolean Disable Service Worker and PWA Support
*/
public $enableServiceWorker = true;
/**
* @inheritdoc
*/

5
protected/humhub/modules/web/pwa/controllers/ManifestController.php
View File

@ -41,7 +41,12 @@ class ManifestController extends Controller
public function actionIndex()
{
$this->handleIcons();
/** @var Module $module */
$module = Yii::$app->getModule('web');
if ($module->enableServiceWorker !== false) {
$this->handlePwa();
}
return $this->asJson($this->manifest);
}

15
protected/humhub/modules/web/pwa/widgets/LayoutHeader.php
View File

@ -12,7 +12,7 @@ use Yii;
use yii\base\WidgetEvent;
use yii\helpers\Url;
use humhub\components\Widget;
use humhub\modules\ui\Module;
use humhub\modules\web\Module;
use humhub\modules\ui\view\components\View;
/**
@ -30,6 +30,7 @@ class LayoutHeader extends Widget
*/
public static function registerHeadTags(View $view)
{
$view->registerMetaTag(['name' => 'theme-color', 'content' => Yii::$app->view->theme->variable('primary')]);
$view->registerMetaTag(['name' => 'application-name', 'content' => Yii::$app->name]);
@ -41,14 +42,21 @@ class LayoutHeader extends Widget
$view->registerLinkTag(['rel' => 'manifest', 'href' => Url::to(['/web/pwa-manifest/index'])]);
/** @var Module $module */
$module = Yii::$app->getModule('web');
if ($module->enableServiceWorker !== false) {
static::registerServiceWorker($view);
}
}
private static function registerServiceWorker(View $view)
{
$cacheId = Yii::$app->cache->getOrSet('service-worker-cache-id', function () {
return time();
});
$serviceWorkUrl = Url::to(['/web/pwa-service-worker/index', 'v' => $cacheId]);
$rootPath = Yii::getAlias('@web') . '/';
$view->registerJs(<<<JS
if ('serviceWorker' in navigator) {
navigator.serviceWorker.register('$serviceWorkUrl', { scope: '$rootPath' })
@ -60,6 +68,7 @@ class LayoutHeader extends Widget
}
JS
, View::POS_READY, 'serviceWorkerInit');
}
}