Merge branch 'master' into feature/615

resources/assets/js/components/back-top-top.js

@@ -6,6 +6,12 @@ class BackToTop {
         this.targetElem = document.getElementById('header');
         this.showing = false;
         this.breakPoint = 1200;
+
+        if (document.body.classList.contains('flexbox')) {
+            this.elem.style.display = 'none';
+            return;
+        }
+
         this.elem.addEventListener('click', this.scrollToTop.bind(this));
         window.addEventListener('scroll', this.onPageScroll.bind(this));
     }

resources/assets/js/services/code.js

@@ -20,13 +20,13 @@ const CodeMirror = require('codemirror');
 
 const modeMap = {
     css: 'css',
-    c: 'clike',
-    java: 'clike',
-    scala: 'clike',
-    kotlin: 'clike',
-    'c++': 'clike',
-    'c#': 'clike',
-    csharp: 'clike',
+    c: 'text/x-csrc',
+    java: 'text/x-java',
+    scala: 'text/x-scala',
+    kotlin: 'text/x-kotlin',
+    'c++': 'text/x-c++src',
+    'c#': 'text/x-csharp',
+    csharp: 'text/x-csharp',
     diff: 'diff',
     go: 'go',
     html: 'htmlmixed',

resources/assets/js/vues/page-editor.js

@@ -99,7 +99,7 @@ let methods = {
             lastSave = Date.now();
         }, errorRes => {
             if (draftErroring) return;
-            window.$events('error', trans('errors.page_draft_autosave_fail'));
+            window.$events.emit('error', trans('errors.page_draft_autosave_fail'));
             draftErroring = true;
         });
     },