[Libreoffice-commits] online.git: Branch 'libreoffice-6-4' - loleaflet/admin

Fri Nov 22 10:23:04 UTC 2019

loleaflet/admin/admin.html             |   11 ++++++-----
 loleaflet/admin/src/AdminSocketBase.js |    8 ++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit b7ad198f211781d537acaf5540b682fbc12c059a
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed Nov 20 14:31:33 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Nov 22 11:22:46 2019 +0100

    IE11 - adminconsole, polyfill and HTML cleanup.
    
    Change-Id: I1cbc24aeb3c0398f399702ac9749a204b1b59a56
    Reviewed-on: https://gerrit.libreoffice.org/83318
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/admin/admin.html b/loleaflet/admin/admin.html
index 342d6ea80..c310321a7 100644
--- a/loleaflet/admin/admin.html
+++ b/loleaflet/admin/admin.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-    <meta name="description" content="">
-    <meta name="author" content="">
+    <meta name="description" content=""/>
+    <meta name="author" content=""/>
 
     <title>LibreOffice Online - Admin console</title>
 
@@ -90,6 +90,7 @@
 	      <h4><script>document.write(l10nstrings.strServerUptime)</script></h4>
 	    </div>
 	  </div>
+    </div>
     <div class="container-fluid">
       <ul class="nav nav-tabs">
       <li class="active">
diff --git a/loleaflet/admin/src/AdminSocketBase.js b/loleaflet/admin/src/AdminSocketBase.js
index 35480a388..a8c136d6d 100644
--- a/loleaflet/admin/src/AdminSocketBase.js
+++ b/loleaflet/admin/src/AdminSocketBase.js
@@ -4,6 +4,14 @@
 */
 
 /* global _ Util vex Base */
+
+// polyfill startsWith for IE11
+if (typeof String.prototype.startsWith !== 'function') {
+	String.prototype.startsWith = function (str) {
+		return this.slice(0, str.length) === str;
+	};
+}
+
 var AdminSocketBase = Base.extend({
 	socket: null,
 
