updated check for require in code-editor

ZeroX-DG · Aug 18, 2018 · 3ad5c42 · 3ad5c42
1 parent 9a3d8c0
commit 3ad5c42
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/app/app-main.js b/app/app-main.js
@@ -1,5 +1,5 @@
 const { app, Menu, ipcMain } = require('electron')
-const { pageView } = require('../browser/lib/analytics')
+// const { pageView } = require('../browser/lib/analytics')
 
 let mainWindow = null
 
@@ -23,7 +23,7 @@ if (isSecondInstance) {
 }
 
 app.on('ready', () => {
-  pageView('/main-process')
+  // pageView('/main-process')
   mainWindow = require('./app-window')(app)
   require('./app-tray')(app, mainWindow)
   ipcMain.on('bringToFront', () => {

diff --git a/browser/render/components/code-editor/index.jsx b/browser/render/components/code-editor/index.jsx
@@ -19,7 +19,9 @@ export default class CodeEditor extends React.Component {
     if (snippet) {
       const { theme, showLineNumber, highlightCurrentLine } = config.editor
       const snippetMode = CodeMirror.findModeByName(snippet.lang).mode
-      require(`codemirror/mode/${snippetMode}/${snippetMode}`)
+      if (snippetMode && snippetMode !== 'null') {
+        require(`codemirror/mode/${snippetMode}/${snippetMode}`)
+      }
       const gutters = showLineNumber
         ? ['CodeMirror-linenumbers', 'CodeMirror-foldgutter']
         : []
@@ -64,7 +66,9 @@ export default class CodeEditor extends React.Component {
     let snippetMode = 'null'
     if (resultMode) {
       snippetMode = resultMode.mode
-      require(`codemirror/mode/${snippetMode}/${snippetMode}`)
+      if (snippetMode && snippetMode !== 'null') {
+        require(`codemirror/mode/${snippetMode}/${snippetMode}`)
+      }
     }
 
     const gutters = showLineNumber
@@ -113,7 +117,9 @@ export default class CodeEditor extends React.Component {
   onUpdateSingleFileSnippet (props) {
     const { snippet } = props
     const snippetMode = CodeMirror.findModeByName(snippet.lang).mode
-    require(`codemirror/mode/${snippetMode}/${snippetMode}`)
+    if (snippetMode && snippetMode !== 'null') {
+      require(`codemirror/mode/${snippetMode}/${snippetMode}`)
+    }
     this.editor.setValue(snippet.value)
     this.editor.setOption('mode', snippetMode)
   }
@@ -129,7 +135,9 @@ export default class CodeEditor extends React.Component {
         let snippetMode = 'null'
         if (resultMode) {
           snippetMode = resultMode.mode
-          require(`codemirror/mode/${snippetMode}/${snippetMode}`)
+          if (snippetMode && snippetMode !== 'null') {
+            require(`codemirror/mode/${snippetMode}/${snippetMode}`)
+          }
         }
 
         this.editor.setOption('mode', snippetMode)
@@ -152,7 +160,9 @@ export default class CodeEditor extends React.Component {
     // only update codemirror mode if new props is passed
     if (props) {
       const snippetMode = CodeMirror.findModeByName(snippet.lang).mode
-      require(`codemirror/mode/${snippetMode}/${snippetMode}`)
+      if (snippetMode && snippetMode !== 'null') {
+        require(`codemirror/mode/${snippetMode}/${snippetMode}`)
+      }
     }
     const gutters = showLineNumber
       ? ['CodeMirror-linenumbers', 'CodeMirror-foldgutter']
@@ -208,7 +218,9 @@ export default class CodeEditor extends React.Component {
       let snippetMode = 'null'
       if (resultMode) {
         snippetMode = resultMode.mode
-        require(`codemirror/mode/${snippetMode}/${snippetMode}`)
+        if (snippetMode && snippetMode !== 'null') {
+          require(`codemirror/mode/${snippetMode}/${snippetMode}`)
+        }
       }
     }