hterm 1.33: Fix user-css merge lossage.
* A previous merge lost the user-css pref changes to hterm_terminal.js.
Change-Id: I79693dddb4ea9960ddf223f4f456a16173ad2d0b
Reviewed-on: https://chromium-review.googlesource.com/190068
Reviewed-by: Marvelous Marius <mschilder@chromium.org>
Commit-Queue: Marvelous Marius <mschilder@chromium.org>
Reviewed-by: Robert Ginda <rginda@chromium.org>
Tested-by: Robert Ginda <rginda@chromium.org>
diff --git a/hterm/js/hterm_terminal.js b/hterm/js/hterm_terminal.js
index 9be742a..bfaba22 100644
--- a/hterm/js/hterm_terminal.js
+++ b/hterm/js/hterm_terminal.js
@@ -317,6 +317,10 @@
terminal.syncMousePasteButton();
},
+ 'page-keys-scroll': function(v) {
+ terminal.keyboard.pageKeysScroll = v;
+ },
+
'pass-alt-number': function(v) {
if (v == null) {
var osx = window.navigator.userAgent.match(/Mac OS X/);
@@ -387,8 +391,8 @@
terminal.keyboard.shiftInsertPaste = v;
},
- 'page-keys-scroll': function(v) {
- terminal.keyboard.pageKeysScroll = v;
+ 'user-css': function(v) {
+ terminal.scrollPort_.setUserCss(v);
}
});
@@ -1052,6 +1056,7 @@
this.scrollPort_.setBackgroundSize(this.prefs_.get('background-size'));
this.scrollPort_.setBackgroundPosition(
this.prefs_.get('background-position'));
+ this.scrollPort_.setUserCss(this.prefs_.get('user-css'));
this.div_.focus = this.focus.bind(this);