Skip to content

Commit

Permalink
Merge pull request #28 from dmstr/feature/remove-deprecated-outdaten-…
Browse files Browse the repository at this point in the history
…browser-package

Removed outdate browser dependency from project
  • Loading branch information
eluhr authored Apr 4, 2024
2 parents 616c99a + e46158d commit 4fb3d46
Show file tree
Hide file tree
Showing 9 changed files with 5 additions and 60 deletions.
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ Add module to application configuration
],
```

By adding `backendBrowserSupport` to your app params you can specify which browser versions are supported in your backend configuration.
Examples see at [urosg80/yii2-outdatedbrowser-rework](https://github.com/urosg80/yii2-outdatedbrowser-rework)

### Minimalistic Login view from AdminLTE 2

```
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"dmstr/yii2-adminlte-asset": "^2.5.0",
"insolita/yii2-adminlte-widgets": "^1.1.4",
"loveorigami/yii2-notification-wrapper": "^6.3",
"urosg/yii2-outdated-browser-rework": "^1.0",
"rmrevin/yii2-fontawesome": "^2.17"
},
"suggest": {
Expand Down
6 changes: 2 additions & 4 deletions src/assets/BackendAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

namespace dmstr\modules\backend\assets;

use urosg\widgets\OutdatedBrowserRework\OutdatedBrowserReworkWidgetAsset;
use yii\web\AssetBundle as BaseBackendAssetBundle;
use dmstr\web\AdminLteAsset;

Expand All @@ -19,14 +18,13 @@
*/
class BackendAsset extends BaseBackendAssetBundle
{
public $sourcePath = '@vendor/dmstr/yii2-backend-module/src/assets/backend';
public $sourcePath = __DIR__ . '/backend';

public $css = [
'less/backend.less',
];

public $depends = [
AdminLteAsset::class,
OutdatedBrowserReworkWidgetAsset::class
AdminLteAsset::class
];
}
7 changes: 3 additions & 4 deletions src/assets/BackendJsAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
*/
class BackendJsAsset extends AssetBundle
{
public $sourcePath = '@vendor/dmstr/yii2-backend-module/src/assets/backend';
public $sourcePath = __DIR__ . '/backend-js';

public $js = [
'js/is-framed.js',
'js/outdated-browser.js',
'is-framed.js'
];
public $jsOptions = [
'position' => View::POS_BEGIN
];
}
}
File renamed without changes.
15 changes: 0 additions & 15 deletions src/assets/backend/js/outdated-browser.js

This file was deleted.

1 change: 0 additions & 1 deletion src/assets/backend/less/backend.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

@import (reference) "@{bowerAssetPath}/bootstrap/less/bootstrap.less";
@import "json-editor";
@import "outdated-browser";

html,
body {
Expand Down
19 changes: 0 additions & 19 deletions src/assets/backend/less/outdated-browser.less

This file was deleted.

13 changes: 0 additions & 13 deletions src/views/layouts/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
use lo\modules\noty\layers\Growl;
use lo\modules\noty\Wrapper;
use rmrevin\yii\fontawesome\FA;
use urosg\widgets\OutdatedBrowserRework\OutdatedBrowserReworkWidget;
use Yii;
use yii\base\InvalidCallException;
use yii\helpers\Html;
Expand Down Expand Up @@ -62,18 +61,6 @@
<body class="dmstr-backend hold-transition skin-<?= $adminLteSkin ?>
<?= Yii::$app->request->cookies['dmstr-backend_pin-navigation'] ? '' : 'sidebar-collapse' ?>
<?= $sidebarClass ?> ">
<?= !YII_ENV_TEST ? OutdatedBrowserReworkWidget::widget([
'messages' => [
'outOfDate' => Yii::t('backend-module', 'Your browser is not fully supported by this website.'),
'updateWeb' => Yii::t('backend-module', 'We recommend to upgrading to the latest {chrome-link}', ['chrome-link' => Html::a('Chrome', 'https://www.google.de/chrome'), ['target' => '_blank']]),
'updateGooglePlay' => Yii::t('backend-module', 'Please install Chrome from Google Play'),
'updateAppStore' => Yii::t('backend-module', 'Please update iOS from the Settings'),
'webUpdateUrl' => null,
'callToAction' => null,
'close' => Yii::t('backend-module', 'Close')
],
'browserSupport' => Yii::$app->params['backend.browserSupport'] ?? []
]) : '' ?>
<?php $this->beginBody() ?>


Expand Down

0 comments on commit 4fb3d46

Please sign in to comment.