Merge branch '4326-fix-js-or-true' into 'master'

Fix a JS bug in the websocket terminal See merge request gitlab-org/gitlab-ce!17470

Merge branch '4326-fix-js-or-true' into 'master'
87e16313 · Clement Ho · 10cf1294 · 6931dd7f · 87e16313
Commit 87e16313 authored Mar 07, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

terminal.js app/assets/javascripts/terminal/terminal.js +8 -2

No files found.
--- a/app/assets/javascripts/terminal/terminal.js
+++ b/app/assets/javascripts/terminal/terminal.js
@@ -6,8 +6,14 @@
    constructor(options) {
      this.options = options || {};

-      this.options.cursorBlink = options.cursorBlink || true;
-      this.options.screenKeys = options.screenKeys || true;
+      if (!Object.prototype.hasOwnProperty.call(this.options, 'cursorBlink')) {
+        this.options.cursorBlink = true;
+      }
+
+      if (!Object.prototype.hasOwnProperty.call(this.options, 'screenKeys')) {
+        this.options.screenKeys = true;
+      }
+
      this.container = document.querySelector(options.selector);

      this.setSocketUrl();