Merge pull request #3123 from rhamilto/xterm

Bug 1668235: Bump kubernetes-container-terminal to v3.0.1 to pick up bug fixes
openshift · Apr 2, 2019 · 61e72bf · 61e72bf
2 parents e7e7636 + eb684b5
commit 61e72bf
Show file tree

Hide file tree

Showing 4 changed files with 6,437 additions and 4,928 deletions.
diff --git a/app/index.html b/app/index.html
@@ -20,7 +20,7 @@
     <link rel="stylesheet" href="bower_components/angularjs-datatables/dist/plugins/bootstrap/datatables.bootstrap.min.css" />
     <link rel="stylesheet" href="bower_components/angular-patternfly/dist/styles/angular-patternfly.css" />
     <link rel="stylesheet" href="bower_components/kubernetes-label-selector/labelFilter.css" />
-    <link rel="stylesheet" href="bower_components/xterm.js-next/xterm.css" />
+    <link rel="stylesheet" href="bower_components/kubernetes-container-terminal/dist/xterm.css" />
     <link rel="stylesheet" href="bower_components/kubernetes-container-terminal/dist/container-terminal.css" />
     <link rel="stylesheet" href="bower_components/registry-image-widgets/dist/image-widgets.css" />
     <link rel="stylesheet" href="bower_components/ng-sortable/dist/ng-sortable.css" />
@@ -136,7 +136,7 @@ <h1>JavaScript Required</h1>
     <script src="bower_components/selectize/dist/js/selectize.js"></script>
     <script src="bower_components/kubernetes-label-selector/labelSelector.js"></script>
     <script src="bower_components/kubernetes-label-selector/labelFilter.js"></script>
-    <script src="bower_components/xterm.js-next/xterm.js"></script>
+    <script src="bower_components/kubernetes-container-terminal/dist/xterm.js"></script>
     <script src="bower_components/kubernetes-container-terminal/dist/container-terminal.js"></script>
     <script src="bower_components/registry-image-widgets/dist/image-widgets.js"></script>
     <script src="bower_components/kubernetes-object-describer/dist/object-describer.js"></script>

diff --git a/bower.json b/bower.json
@@ -26,7 +26,7 @@
     "selectize": "0.12.1",
     "c3": "0.4.11",
     "kubernetes-label-selector": "2.1.1",
-    "kubernetes-container-terminal": "3.0.0",
+    "kubernetes-container-terminal": "3.0.1",
     "registry-image-widgets": "https://github.com/cockpit-project/registry-image-widgets.git#0.0.15",
     "kubernetes-object-describer": "1.0.4",
     "bootstrap-hover-dropdown": "2.1.3",