diff options
| -rw-r--r-- | common/content/editor.js | 2 | ||||
| -rw-r--r-- | common/modules/buffer.jsm | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/common/content/editor.js b/common/content/editor.js index 0caf5a4f..28611ebf 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -1229,7 +1229,7 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), { }, { count: true }); - mappings.add([modes.TEXT_EDIT, modes.VISUAL], + mappings.add([modes.COMMAND], ['"'], "Bind a register to the next command", function ({ arg }) { editor.currentRegister = arg; diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm index bd632d57..184d9cda 100644 --- a/common/modules/buffer.jsm +++ b/common/modules/buffer.jsm @@ -175,7 +175,10 @@ var Buffer = Module("Buffer", { * @property {number} The current browser's zoom level, as a * percentage with 100 as 'normal'. */ - get zoomLevel() this.contentViewer[this.fullZoom ? "fullZoom" : "textZoom"] * 100, + get zoomLevel() { + let v = this.contentViewer; + return v[v.textZoom == 1 ? "fullZoom" : "textZoom"] * 100 + }, set zoomLevel(value) { this.setZoom(value, this.fullZoom); }, /** @@ -1162,7 +1165,7 @@ var Buffer = Module("Buffer", { fullZoom = ZoomManager.useFullZoom; let values = ZoomManager.zoomValues; - let cur = values.indexOf(ZoomManager.snap(this.zoom)); + let cur = values.indexOf(ZoomManager.snap(this.zoomLevel / 100)); let i = Math.constrain(cur + steps, 0, values.length - 1); util.assert(i != cur || fullZoom != ZoomManager.useFullZoom); |