Skip to content

Commit

Permalink
[PAMF-613] another tweak; use JS to show 'IE not supported'
Browse files Browse the repository at this point in the history
bower.json change also affects [PAMF-603]

In some circumstances, angularjs is not loaded properly so
I added a small script to remove the 'ng-cloak' attribute
from the alert banner if the browser is IE
(ng-cloak css causes display:none)

Also reverting the changes to bower.json that had bumped angular-js
components to 1.8.2 because this was breaking build,
and reduce upgrade of angular-bootstrap to ^1.0.0 because that's all
we need to get the tabs working and be compatible with angularjs1.5.8
  • Loading branch information
Gerard (Jerry) Vaio committed Dec 30, 2020
1 parent e87f9c5 commit 396b44a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
15 changes: 9 additions & 6 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,12 @@
</div>

<!-- Add your site or application content here -->
<script> if (window.navigator.userAgent.match(/MSIE|Trident/)) {alert("Internet Explorer is no longer supported. Please reopen FindMyRide using another browser such as Chrome, Edge, or Safari.");} </script>
<div class="container-fluid">
<div class = "col-md-10 col-md-offset-1">
<div class="alert alert-danger text-center" role="alert" ng-show="isUnsupportedBrowser" ng-cloak>
<h2>Internet Explorer is no longer supported. Please reopen FindMyRide using another browser such as Chrome, Edge, or Safari.</h2>
</div>
<div class = "col-md-10 col-md-offset-1">
<div id="iewarn" class="alert alert-danger text-center" role="alert" ng-show="isUnsupportedBrowser" ng-cloak>
<h2>Internet Explorer is no longer supported. Please reopen FindMyRide using another browser such as Chrome, Edge, or Safari.</h2>
</div>
</div>
<div class="container-fluid">
<div class="alert alert-success alert-dismissible" role="alert" ng-show="flash.getMessage()" ng-cloak>
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{{ flash.getMessage() }}
Expand Down Expand Up @@ -222,6 +221,10 @@ <h2>Internet Explorer is no longer supported. Please reopen FindMyRide using ano
ga('send', 'pageview');

</script>
<script> if (window.navigator.userAgent.match(/MSIE|Trident/)) {
$("#iewarn").removeAttr("ng-cloak");}
</script>


</body>
</html>
8 changes: 3 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"es5-shim": "^4.0.0",
"bootstrap-sass-official": "3.3.7",
"angular-animate": "1.5.8",
"angular-aria": "1.8.2",
"angular-aria": "1.6.1",
"angular-messages": "1.6.1",
"angular-resource": "1.6.1",
"angular-route": "1.6.1",
Expand All @@ -19,7 +19,7 @@
"angular-ui-map": "~0.5.0",
"angular-ui-utils": "bower-event",
"angular-ui": "~0.4.0",
"angular-bootstrap": "2.5.0",
"angular-bootstrap": "^1.0.0",
"humanize-duration": "~2.6.1",
"angular-local-storage": "~0.1.5",
"ng-device-detector": "~1.1.5",
Expand All @@ -34,8 +34,6 @@
"resolutions": {
"angular": "1.5.8",
"angular-ui-utils": "0.x",
"bootbox": "^5.3.4",
"angular-bootstrap": "2.5.0",
"angular-aria": "1.6.1"
"bootbox": "^5.3.4"
}
}

0 comments on commit 396b44a

Please sign in to comment.