From ca82e4000ad665f02cf82478cf65db3a71a88d70 Mon Sep 17 00:00:00 2001
From: Sebastian Serth <Sebastian.Serth@hpi.de>
Date: Tue, 3 Mar 2020 18:13:30 +0100
Subject: [PATCH] Always render "browser not supported" alert and disable it
 for supported browsers

---
 app/assets/javascripts/editor.js            | 3 +--
 app/assets/javascripts/editor/editor.js.erb | 5 +++--
 app/assets/stylesheets/editor.css.scss      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/editor.js b/app/assets/javascripts/editor.js
index 0df0ffe2..3b7d42d6 100644
--- a/app/assets/javascripts/editor.js
+++ b/app/assets/javascripts/editor.js
@@ -16,9 +16,8 @@ $(document).on('turbolinks:load', function() {
 
   if ($('#editor').isPresent() && CodeOceanEditor) {
     if (CodeOceanEditor.isBrowserSupported()) {
+      $('#alert').hide();
       CodeOceanEditor.initializeEverything();
-    } else {
-      $('#alert').show();
     }
   }
 });
diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb
index 88161526..b394beb0 100644
--- a/app/assets/javascripts/editor/editor.js.erb
+++ b/app/assets/javascripts/editor/editor.js.erb
@@ -418,7 +418,8 @@ configureEditors: function () {
 
   isBrowserSupported: function () {
     //  websockets are used for run, score and test
-    return Modernizr.websockets;
+    // Also exclude IE and IE 11
+    return Modernizr.websockets && window.navigator.userAgent.indexOf("MSIE") <= 0 && !navigator.userAgent.match(/Trident\/7\./);
   },
 
   populateCard: function (card, result, index) {
@@ -723,7 +724,7 @@ configureEditors: function () {
                                         type: 'POST',
                                         url: $('#editor').data('intervention-save-url')
                                     });
-                                };
+                                }
                             }
                         }
                     }, delta);
diff --git a/app/assets/stylesheets/editor.css.scss b/app/assets/stylesheets/editor.css.scss
index 0459dde3..752b6b78 100644
--- a/app/assets/stylesheets/editor.css.scss
+++ b/app/assets/stylesheets/editor.css.scss
@@ -31,7 +31,7 @@ button i.fa-spin {
   vertical-align: bottom;
 }
 
-#alert, #development-environment {
+#development-environment {
   display: none;
 }