Merge pull request #1 from vimperator/master

update to master branch

Author: Quicksaver

common/content/buffer.js

@@ -703,7 +703,7 @@ const Buffer = Module("buffer", {
      * Scrolls to the bottom of the current buffer.
      */
     scrollBottom: function () {
-        Buffer.scrollToPercent(null, 100);
+        Buffer.scrollElemToPercent(null, null, 100);
     },
 
     /**
@@ -720,7 +720,7 @@ const Buffer = Module("buffer", {
      * Scrolls to the top of the current buffer.
      */
     scrollEnd: function () {
-        Buffer.scrollToPercent(100, null);
+        Buffer.scrollElemToPercent(null, 100, null);
     },
 
     /**
@@ -747,21 +747,19 @@ const Buffer = Module("buffer", {
      * Scrolls the buffer vertically 'scroll' lines.
      *
      * @param {boolean} direction The direction to scroll. If true then
-     *     scroll up and if false scroll down.
+     *     scroll down and if false scroll up.
      * @param {number} count The multiple of 'scroll' lines to scroll.
      * @optional
      */
     scrollByScrollSize: function (direction, count) {
         direction = direction ? 1 : -1;
         count = count || 1;
-        let win = Buffer.findScrollableWindow();
-
-        Buffer.checkScrollYBounds(win, direction);
+        let elem = Buffer.findScrollable(direction, false);
 
         if (options["scroll"] > 0)
             this.scrollLines(options["scroll"] * direction);
         else // scroll half a page down in pixels
-            win.scrollBy(0, win.innerHeight / 2 * direction);
+            elem.scrollTop += Buffer.findScrollableWindow().innerHeight / 2 * direction;
     },
 
     _scrollByScrollSize: function _scrollByScrollSize(count, direction) {
@@ -777,7 +775,7 @@ const Buffer = Module("buffer", {
      * @param {number} y The vertical page percentile.
      */
     scrollToPercent: function (x, y) {
-        Buffer.scrollToPercent(x, y);
+        Buffer.scrollElemToPercent(null, x, y);
     },
 
     /**
@@ -795,14 +793,14 @@ const Buffer = Module("buffer", {
      * Scrolls the current buffer laterally to its leftmost.
      */
     scrollStart: function () {
-        Buffer.scrollToPercent(0, null);
+        Buffer.scrollElemToPercent(null, 0, null);
     },
 
     /**
      * Scrolls the current buffer vertically to the top.
      */
     scrollTop: function () {
-        Buffer.scrollToPercent(null, 0);
+        Buffer.scrollElemToPercent(null, null, 0);
     },
 
     // TODO: allow callback for filtering out unwanted frames? User defined?
@@ -1069,7 +1067,7 @@ const Buffer = Module("buffer", {
         return win;
     },
 
-    findScrollable: function findScrollable(dir, horizontal) {
+    findScrollable: function findScrollable(dir = 0, horizontal) {
         let pos = "scrollTop", maxPos = "scrollTopMax", clientSize = "clientHeight";
         if (horizontal)
             pos = "scrollLeft", maxPos = "scrollLeftMax", clientSize = "clientWidth";
@@ -1081,7 +1079,7 @@ const Buffer = Module("buffer", {
             for (; elem && elem.parentNode instanceof Element; elem = elem.parentNode) {
                 if (elem[clientSize] == 0)
                     continue;
-                if (dir < 0 && elem[pos] > 0 || dir > 0 && elem[pos] < elem[maxPos])
+                if (dir < 0 && elem[pos] > 0 || dir > 0 && elem[pos] < elem[maxPos] || dir == 0 && elem[maxPos] > 0)
                     break;
             }
             return elem;
@@ -1816,4 +1814,7 @@ const Buffer = Module("buffer", {
     }
 });
 
+/* Expose Buffer constructor */
+Object.defineProperty(this, "Buffer", { value: Buffer });
+
 // vim: set fdm=marker sw=4 ts=4 et:

common/content/commands.js

@@ -1187,6 +1187,8 @@ const Commands = Module("commands", {
 });
 
 (function () {
+    /* Expose Command constructor for user-defined sub-commands. */
+    Object.defineProperty(this, "Command", { value: Command });
 
     Commands.quoteMap = {
         "\n": "n",

common/content/events.js

@@ -1147,6 +1147,9 @@ const Events = Module("events", {
             return;
         }
 
+        if (!options['passthrough'])
+            event.stopPropagation();
+
         // liberator.echo ("key: " + key + "\nkeycode: " + event.keyCode + "\nchar: " + event.charCode + "\ntype: " + event.type + "\nwhich: " + event.which);
     },
 

common/content/statusline.js

@@ -154,7 +154,7 @@ const StatusLine = Module("statusline", {
         var toggle_on = function () {
             bb.style.height = '';
             bb.style.overflow = '';
-            highlight.set('ContentSeparator', sv.contentSeparatorValue);
+            highlight.set('ContentSeparator', sv.contentSeparator);
         };
 
         switch (request) {

common/content/tabs.js

@@ -1130,6 +1130,10 @@ const Tabs = Module("tabs", {
                     ]
                 });
 
+            options.add(["passthrough"],
+                "Define if keypresses are passed to webpages outside of Insert mode",
+                "boolean", false);
+
             options.add(["popups", "pps"],
                 "Where to show requested popup windows",
                 "stringlist", "tab",

common/locale/en-US/options.xml

@@ -893,6 +893,17 @@
 </item>
 
 
+<item>
+    <tags>'nopassthrough' 'passthrough'</tags>
+    <spec>'passthrough'</spec>
+    <type>boolean</type>
+    <default>off</default>
+    <description>
+        <p>Define if keypresses are passed to webpages if you are not in Insert mode.</p>
+    </description>
+</item>
+
+
 <item>
     <tags>'pps' 'popups'</tags>
     <spec>'popups' 'pps'</spec>

vimperator/Makefile

@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 3.10.1
+VERSION       = 3.11.3
 NAME          = vimperator
 
 include ../common/Makefile

vimperator/NEWS

@@ -1,4 +1,12 @@
 201x-xx-xx:
+
+2016-01-30:
+    * Expose Buffer constructor
+    * Fix scrolling on some pages with gg/G/<C-d>/<C-u>
+    * Make sure to get latest content separator in setVisibility
+    * Expose Command constructor
+
+2016-01-26:
     * QuickMarks: new mapping [m]gw{a-z}[m] to open Quickmark in a new window as the single open tab 
     * :delmacro matches the syntax and behaviour of :delqmark, e.g. allowing ranges as argument
     * Stop propagation for keyboard event if that key are contained in -except option on :ignorekeys
@@ -7,6 +15,9 @@
     browser.tabs.closeWindowWithLastTab, which means those who are used to :tabclose never closing
     the window when closing the last tab, should set this option to false (either through about:config
     or with :set! browser.tabs.closeWindowWithLastTab=false)
+    * Added setting for controlling if keypresses are passed to webpages when
+    outside of Insert/Passthrough modes (to revert to old setting,
+    :set passthrough=true)
     * gr toggles Reader View
     * Autohide statusbar: When entering fullscreen mode, the statusbar is
       hidden and temporarily showed up with command inputs. Also, Users can

vimperator/content/tabgroup.js

@@ -346,6 +346,35 @@ var TabGroup = Module("tabGroup", {
                     literal: 0,
                     completer: function (context) completion.tabgroup(context, false),
                 }),
+            /**
+             * Panorama SubCommand rename
+             * rename {name}.
+             * clear the name of the current group if bang(!) specified and {name} is ommited.
+             */
+            new Command(["rename", "mv"], "Rename current tab group (or reset to '(Untitled)').",
+                function (args) {
+                    let title = args.literalArg;
+                    if (!title) {
+                        if (args.bang)
+                            title = "";
+                        else {
+                            liberator.echoerr("No title supplied!  Add \"!\" if want to clear it.");
+                            return;
+                        }
+                    }
+                    let activeGroup = tabGroup.tabView.GroupItems.getActiveGroupItem();
+                    if (activeGroup)
+                        activeGroup.setTitle(title);
+                }, {
+                    bang: true,
+                    literal: 0,
+                    completer: function (context) {
+                        context.title = ["Rename current group"];
+                        let activeGroup = tabGroup.tabView.GroupItems.getActiveGroupItem();
+                        let title = activeGroup ? activeGroup.getTitle() : "";
+                        context.completions = title ? [[title, ""]] : [];
+                    }
+                }),
             /**
              * Panorama SubCommand switch
              * switch to the {group}.

vimperator/locale/en-US/tabs.xml

@@ -123,6 +123,21 @@
             </description>
         </item>
 
+        <item>
+            <tags>tabgroups-rename tabgroups-mv</tags>
+            <spec>rename<oa>!</oa> <oa>newGroupName</oa></spec>
+            <spec>mv<oa>!</oa> <oa>newGroupName</oa></spec>
+            <description>
+                <p>
+                    Rename current tab group to <oa>newGroupName</oa>.
+                </p>
+                <p>
+                    If <oa>newGroupName</oa> is not supplied and <oa>!</oa> is
+                    specified, resets group's name to <o>(Untitled)</o>.
+                </p>
+            </description>
+        </item>
+
         <item>
             <tags>tabgroups-switch</tags>
             <spec><oa>count</oa>switch <a>groupName</a></spec>