Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/compatibility/edge #1064

Merged
merged 2 commits into from
Apr 16, 2019
Merged

Fix/compatibility/edge #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ca0713
Edge compatibility
skjnldsv Apr 16, 2019
92c383e
Proper IE warning
skjnldsv Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .babelrc.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion css/ContactsList.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
width: 44px;
height: 44px;
z-index: 149;
background-color: var(--color-main-background-darker);
background-color: var(--color-background-darker);
cursor: pointer;
opacity: 0.6;
transform: rotate(180deg);
Expand Down
20 changes: 11 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
},
"devDependencies": {
"@babel/core": "^7.4.3",
"@babel/plugin-proposal-object-rest-spread": "^7.4.3",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/preset-env": "^7.4.3",
"@vue/test-utils": "^1.0.0-beta.29",
Expand Down
15 changes: 13 additions & 2 deletions templates/main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<?php
script('contacts', 'contacts');
style('contacts', 'contacts');
if (!\OCP\Util::isIe()) {
script('contacts', 'contacts');
style('contacts', 'contacts');
} else {
?>
<div id="app-content">
<div class="emptycontent">
<div class="icon-contacts-dark"></div>
<h2><?php p($l->t('Your web browser is out of date')); ?></h2>
<p><?php p($l->t('This application is not compatible with Internet Explorer')); ?></p>
</div>
</div>

<?php } ?>
13 changes: 11 additions & 2 deletions webpack.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,17 @@ module.exports = {
},
{
test: /\.js$/,
loader: 'babel-loader',
exclude: /node_modules/
use: {
loader: 'babel-loader',
options: {
plugins: [
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-proposal-object-rest-spread'
],
presets: ['@babel/preset-env']
}
},
exclude: /node_modules\/(?!(p-limit|p-defer|p-queue|p-try|cdav-library))/
},
{
test: /\.(png|jpg|gif|svg)$/,
Expand Down