github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 12:42:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: browser-update should work with old browsers (#12436)

Browse Source 
This caused issues in IE10 / IE11 with compatibility mode.
This commit is contained in:
Dan Ungureanu 2021-03-18 19:09:01 +02:00 committed by GitHub
parent 5024ea72d2
commit da1e37d2ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@ -1,3 +1,4 @@
app/assets/javascripts/browser-update.js
app/assets/javascripts/discourse-loader.js app/assets/javascripts/discourse-loader.js
app/assets/javascripts/env.js app/assets/javascripts/env.js
app/assets/javascripts/main_include_admin.js app/assets/javascripts/main_include_admin.js

1
.prettierignore
View File

@ -6,6 +6,7 @@ config/locales/**/*.yml
!config/locales/**/*.en*.yml !config/locales/**/*.en*.yml
script/import_scripts/**/*.yml script/import_scripts/**/*.yml
app/assets/javascripts/browser-update.js
app/assets/javascripts/discourse-loader.js app/assets/javascripts/discourse-loader.js
app/assets/javascripts/env.js app/assets/javascripts/env.js
app/assets/javascripts/main_include_admin.js app/assets/javascripts/main_include_admin.js

20
app/assets/javascripts/browser-update.js
View File

@ -1,11 +1,13 @@
//browser-update.org notification script, <browser-update.org> //browser-update.org notification script, <browser-update.org>
//Copyright (c) 2007-2009, MIT Style License <browser-update.org/LICENSE.txt> //Copyright (c) 2007-2009, MIT Style License <browser-update.org/LICENSE.txt>
/* eslint-disable no-var */
(function () { (function () {
let $buo = function () { var $buo = function () {
// Sometimes we have to resort to parsing the user agent string. :( // Sometimes we have to resort to parsing the user agent string. :(
if (navigator && navigator.userAgent) { if (navigator && navigator.userAgent) {
let ua = navigator.userAgent; var ua = navigator.userAgent;
// we don't ask Googlebot to update their browser // we don't ask Googlebot to update their browser
if ( if (
@ -22,10 +24,10 @@
} }
document.getElementsByTagName("body")[0].className += " crawler"; document.getElementsByTagName("body")[0].className += " crawler";
let mainElement = document.getElementById("main"); var mainElement = document.getElementById("main");
let noscriptElements = document.getElementsByTagName("noscript"); var noscriptElements = document.getElementsByTagName("noscript");
// find the element with the "data-path" attribute set // find the element with the "data-path" attribute set
for (let i = 0; i < noscriptElements.length; ++i) { for (var i = 0; i < noscriptElements.length; ++i) {
if (noscriptElements[i].getAttribute("data-path")) { if (noscriptElements[i].getAttribute("data-path")) {
// noscriptElements[i].innerHTML contains encoded HTML // noscriptElements[i].innerHTML contains encoded HTML
if (noscriptElements[i].childNodes.length > 0) { if (noscriptElements[i].childNodes.length > 0) {
@ -36,7 +38,7 @@
} }
// retrieve localized browser upgrade text // retrieve localized browser upgrade text
let t = I18n.t("browser_update"); // eslint-disable-line no-undef var t = I18n.t("browser_update"); // eslint-disable-line no-undef
if (t.indexOf(".browser_update]") !== -1) { if (t.indexOf(".browser_update]") !== -1) {
// very old browsers might fail to load even translations // very old browsers might fail to load even translations
t = t =
@ -44,13 +46,13 @@
} }
// create the notification div HTML // create the notification div HTML
let div = document.createElement("div"); var div = document.createElement("div");
div.className = "buorg"; div.className = "buorg";
div.innerHTML = "<div>" + t + "</div>"; div.innerHTML = "<div>" + t + "</div>";
// create the notification div stylesheet // create the notification div stylesheet
let sheet = document.createElement("style"); var sheet = document.createElement("style");
let style = var style =
".buorg {position:absolute; z-index:111111; width:100%; top:0px; left:0px; background:#FDF2AB; text-align:left; font-family: sans-serif; color:#000; font-size: 14px;} .buorg div {padding: 8px;} .buorg a, .buorg a:visited {color:#E25600; text-decoration: underline;} @media print { .buorg { display: none !important; } }"; ".buorg {position:absolute; z-index:111111; width:100%; top:0px; left:0px; background:#FDF2AB; text-align:left; font-family: sans-serif; color:#000; font-size: 14px;} .buorg div {padding: 8px;} .buorg a, .buorg a:visited {color:#E25600; text-decoration: underline;} @media print { .buorg { display: none !important; } }";
// insert the div and stylesheet into the DOM // insert the div and stylesheet into the DOM