Skip to content

Commit

Permalink
Merge pull request #2398 from jwforres/terminal-refresh
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Bump container terminal to v2.1.1 to fix refresh when disconnect / re-connect

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1506115
  • Loading branch information
openshift-merge-robot authored Oct 30, 2017
2 parents fe5fdfe + 083c2f2 commit c99ed2a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"selectize": "0.12.1",
"c3": "0.4.11",
"kubernetes-label-selector": "2.1.1",
"kubernetes-container-terminal": "2.1.0",
"kubernetes-container-terminal": "2.1.1",
"registry-image-widgets": "https://github.com/cockpit-project/registry-image-widgets.git#0.0.14",
"layout.attrs": "2.1.1",
"kubernetes-object-describer": "1.0.4",
Expand Down
6 changes: 3 additions & 3 deletions dist/scripts/vendor.js
Original file line number Diff line number Diff line change
Expand Up @@ -57688,7 +57688,7 @@ case "2":
case "3":
m.write(i(t));
}
c && (c = !1, h.addClass("hidden"), f.addClass("hidden"), m.cursorHidden = !1, m.showCursor(), m.refresh(m.y, m.y), a.autofocus && m.element && m.focus());
c && (c = !1, h.addClass("hidden"), f.addClass("hidden"), m.cursorHidden = !1, m.showCursor(), a.autofocus && m.element && m.focus());
}, g.onclose = function(t) {
a.status = "disconnected", e(t.reason);
};
Expand All @@ -57697,7 +57697,7 @@ e(t.message);
}), a.status = "connected";
}
function u() {
a.status = "disconnected", h.addClass("hidden"), f.removeClass("hidden"), m && (m.cursorHidden = !0, m.refresh(m.x, m.y)), g && (g.onopen = g.onmessage = g.onerror = g.onclose = null, g.readyState < 2 && g.close(), g = null), window.clearInterval(p), p = null;
a.status = "disconnected", h.addClass("hidden"), f.removeClass("hidden"), m && (m.cursorHidden = !0, m.refresh(m.buffer.y, m.buffer.y)), g && (g.onopen = g.onmessage = g.onerror = g.onclose = null, g.readyState < 2 && g.close(), g = null), window.clearInterval(p), p = null;
}
a.status = "disconnected";
var d = e.element("<div class='terminal-wrapper'>");
Expand All @@ -57712,7 +57712,7 @@ screenKeys: a.screenKeys || !0,
applicationCursor: !0,
mouseEvents: !0
});
d.empty(), m.open(d[0]), m.cursorHidden = !0, m.refresh(m.x, m.y), m.on("data", function(e) {
d.empty(), m.open(d[0]), m.cursorHidden = !0, m.refresh(m.buffer.y, m.buffer.y), m.on("data", function(e) {
g && 1 === g.readyState && g.send("0" + n(e));
});
var v = function() {
Expand Down

0 comments on commit c99ed2a

Please sign in to comment.