From e972ecd6ac196199128c9451a56695664df2469b Mon Sep 17 00:00:00 2001
From: "jvanboxtel@wisc.edu" <jvanboxtel@wisc.edu>
Date: Thu, 14 Mar 2019 12:31:18 -0500
Subject: [PATCH] ROENROLL-1466 IE fixes part 2: the wrath of IE
---
angular.json | 32 ++++++-------------
package-lock.json | 16 +++++-----
package.json | 2 +-
.../term-container.component.scss | 6 ++++
src/index.html | 3 +-
src/polyfills.ts | 2 +-
6 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/angular.json b/angular.json
index 6849d22..48184b0 100644
--- a/angular.json
+++ b/angular.json
@@ -18,10 +18,7 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
- "assets": [
- "src/favicon.ico",
- "src/assets"
- ],
+ "assets": ["src/favicon.ico", "src/assets"],
"styles": [
"src/assets/material-theme.scss",
"src/assets/sass/general.scss",
@@ -29,7 +26,8 @@
"src/assets/fonts/material-icons/material-icons.css"
],
"scripts": [
- "./node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js",
+ "./node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js",
+ "./node_modules/css-vars-ponyfill/dist/css-vars-ponyfill.min.js",
"./node_modules/@myuw-web-components/myuw-app-styles/dist/myuw-app-styles.min.js",
"./node_modules/@myuw-web-components/myuw-app-bar/dist/myuw-app-bar.min.js",
"./node_modules/@myuw-web-components/myuw-drawer/dist/myuw-drawer.min.js",
@@ -81,26 +79,16 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
- "styles": [
- "src/styles.css"
- ],
+ "styles": ["src/styles.css"],
"scripts": [],
- "assets": [
- "src/favicon.ico",
- "src/assets"
- ]
+ "assets": ["src/favicon.ico", "src/assets"]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
- "tsConfig": [
- "src/tsconfig.app.json",
- "src/tsconfig.spec.json"
- ],
- "exclude": [
- "**/node_modules/**"
- ]
+ "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
+ "exclude": ["**/node_modules/**"]
}
}
}
@@ -125,9 +113,7 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
- "exclude": [
- "**/node_modules/**"
- ]
+ "exclude": ["**/node_modules/**"]
}
}
}
@@ -139,4 +125,4 @@
"styleext": "scss"
}
}
-}
\ No newline at end of file
+}
diff --git a/package-lock.json b/package-lock.json
index e267a27..7b50f33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -995,7 +995,7 @@
},
"load-json-file": {
"version": "2.0.0",
- "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+ "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
"dev": true,
"requires": {
@@ -1016,7 +1016,7 @@
},
"minimist": {
"version": "1.2.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
},
@@ -1048,7 +1048,7 @@
},
"pify": {
"version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
},
@@ -3386,6 +3386,11 @@
"regexpu-core": "^1.0.0"
}
},
+ "css-vars-ponyfill": {
+ "version": "1.17.2",
+ "resolved": "https://registry.npmjs.org/css-vars-ponyfill/-/css-vars-ponyfill-1.17.2.tgz",
+ "integrity": "sha512-hhdJTdUd9UM0wewdO8+301kba6F5GdfPwIj/lFd13il3xn0yfEuRhrDmLPMfg6R9nPLgbcU0wAp0DRUO/ucE3Q=="
+ },
"cssauron": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
@@ -10990,11 +10995,6 @@
"minimalistic-assert": "^1.0.0"
}
},
- "web-animations-js": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.1.tgz",
- "integrity": "sha1-Om2bwVGWN3qQ+OKAP6UmIWWwRRA="
- },
"webdriver-js-extender": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz",
diff --git a/package.json b/package.json
index 124f35b..95f8e62 100644
--- a/package.json
+++ b/package.json
@@ -38,10 +38,10 @@
"@webcomponents/webcomponentsjs": "^2.2.6",
"classlist.js": "^1.1.20150312",
"core-js": "^2.6.0",
+ "css-vars-ponyfill": "^1.17.2",
"intl": "^1.2.5",
"rxjs": "^6.4.0",
"tslib": "^1.9.0",
- "web-animations-js": "^2.3.1",
"zone.js": "~0.8.29"
},
"devDependencies": {
diff --git a/src/app/degree-planner/term-container/term-container.component.scss b/src/app/degree-planner/term-container/term-container.component.scss
index 1ece3c3..a47d151 100644
--- a/src/app/degree-planner/term-container/term-container.component.scss
+++ b/src/app/degree-planner/term-container/term-container.component.scss
@@ -24,6 +24,12 @@
border-bottom: solid #e0e4e7 1px;
}
+// Fixes for IE11 ugh.
+.mat-tab-body-wrapper,
+.mat-tab-group {
+ height: 100%;
+}
+
.course-list-wrapper {
position: relative;
display: block;
diff --git a/src/index.html b/src/index.html
index 952cbd8..7ac1a41 100644
--- a/src/index.html
+++ b/src/index.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>MyUW | Course Search & Enroll</title>
<base href="/">
-
+
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<script>
@@ -19,4 +19,5 @@
<body>
<cse-root></cse-root>
</body>
+ <script>cssVars({shadowDOM: true,watch: true});</script>
</html>
diff --git a/src/polyfills.ts b/src/polyfills.ts
index e68cbf8..24fd5e5 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -57,7 +57,7 @@ if (!Element.prototype.matches) {
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
**/
-import 'web-animations-js'; // Run `npm install --save web-animations-js`.
+// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/**
* By default, zone.js will patch all possible macroTask and DomEvents
--
GitLab