Merge branch 'master' into passthrough-only-on-insert

Author: Enzime

common/content/buffer.js

@@ -1095,6 +1095,12 @@ const Buffer = Module("buffer", {
 
     scrollVertical: function scrollVertical(elem, increment, number) {
         elem = elem || Buffer.findScrollable(number, false);
+
+        if (elem == null && buffer.loaded == 0) {
+            liberator.echoerr("Page is still loading");
+            return;
+        }
+
         let fontSize = parseInt(util.computedStyle(elem).fontSize);
         if (increment == "lines")
             increment = fontSize;
@@ -1108,6 +1114,12 @@ const Buffer = Module("buffer", {
 
     scrollHorizontal: function scrollHorizontal(elem, increment, number) {
         elem = elem || Buffer.findScrollable(number, true);
+
+        if (elem == null && buffer.loaded == 0) {
+            liberator.echoerr("Page is still loading");
+            return;
+        }
+
         let fontSize = parseInt(util.computedStyle(elem).fontSize);
         if (increment == "columns")
             increment = fontSize; // Good enough, I suppose.

common/content/commands.js

@@ -155,7 +155,7 @@ const Command = Class("Command", {
     action: null,
     /**
      * @property {string} This command's argument count spec.
-     * @see Commands#parseArguments
+     * @see Commands#parseArgs
      */
     argCount: 0,
     /**
@@ -167,7 +167,7 @@ const Command = Class("Command", {
     hereDoc: false,
     /**
      * @property {Array} The options this command takes.
-     * @see Commands@parseArguments
+     * @see Commands@parseArgs
      */
     options: [],
     /**

common/content/events.js

@@ -1098,7 +1098,7 @@ const Events = Module("events", {
 
     onKeyUpOrDown: function (event) {
         // Always let the event be handled by the webpage/Firefox for certain modes
-        if (modes.passNextKey || modes.isMenuShown) 
+        if (modes.isMenuShown) 
             return;
 
         let key = events.toString(event);
@@ -1115,6 +1115,11 @@ const Events = Module("events", {
         // Many sites perform (useful) actions on keydown.
         // Let's keep the most common ones unless we have a mapping for that
         if (event.type == "keydown" && this.isEscapeKey(key)) {
+            if (modes.passNextKey) {
+                modes.passNextKey = false;
+                return;
+            }
+
             this.onEscape(); // We do our Escape handling here, as the on "onKeyPress" may not always work if websites override the keydown event
             event.stopPropagation();
             return;

common/content/mappings.js

@@ -349,7 +349,7 @@ const Mappings = Module("mappings", {
      */
     hasMap: function (mode, cmd, patternOrUrl) {
         let self = this;
-        this._user[mode].some(function (map) map.hasName(cmd) && self._matchingUrlsTest(map, patternOrUrl));
+        return this._user[mode].some(function (map) map.hasName(cmd) && self._matchingUrlsTest(map, patternOrUrl));
     },
 
     /**

common/content/tabs.js

@@ -717,7 +717,8 @@ const Tabs = Module("tabs", {
         commands.add(["tabd[o]", "bufd[o]"],
             "Execute a command in each tab",
             function (args) {
-                for (let i = 0; i < tabs.count; i++) {
+                let count = tabs.count;
+                for (let i = 0; i < Math.min(tabs.count, count); i++) {
                     tabs.select(i);
                     liberator.execute(args.string, null, true);
                 }