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

Author: Enzime

common/content/browser.js

@@ -178,7 +178,7 @@ const Browser = Module("browser", {
                         if (path) {
                             if (path = getParentPath(path))
                                 parent = scheme + host + "/" + path;
-                            else 
+                            else
                                 parent = scheme + host + "/";
                         }
                         else {
@@ -207,6 +207,16 @@ const Browser = Module("browser", {
                 liberator.assert(!/(about|mailto):/.test(uri.protocol)); // exclude these special protocols for now
                 liberator.open(uri.protocol + "//" + (uri.host || "") + "/");
             });
+        mappings.add([modes.NORMAL], ["gr"],
+            "View current tab in Reader View",
+            function () {
+                let uri = content.document.location.href;
+                if (!uri.startsWith("about:reader")) {
+                    liberator.open('about:reader?url=' + uri);
+                } else {
+                    liberator.open(uri.substr("about:reader?url=".length));
+                }
+            });
     },
 
     commands: function () {

common/content/buffer.js

@@ -281,8 +281,13 @@ const Buffer = Module("buffer", {
             asyncUpdateUI.superapply(this, arguments);
         },
         setOverLink: function setOverLink(link, b) {
-            setOverLink.superapply(this, arguments);
             let ssli = options["showstatuslinks"];
+
+            if (ssli == 3) {
+                setOverLink.superapply(this, arguments);
+                return;
+            }
+
             if (link && ssli) {
                 if (ssli == 1) {
                     statusline.updateField("location", "Link: " + link);
@@ -299,7 +304,7 @@ const Buffer = Module("buffer", {
                 }
                 else if (ssli == 2)
                     modes.show();
-                }
+            }
         },
     },
 
@@ -1792,8 +1797,9 @@ const Buffer = Module("buffer", {
             {
                 completer: function (context) [
                     ["0", "Don't show link destination"],
-                    ["1", "Show the link in the status line"],
-                    ["2", "Show the link in the command line"]
+                    ["1", "Show the link destination in the status line"],
+                    ["2", "Show the link destination in the command line"],
+                    ["3", "Show the link destination in the content area"]
                 ]
             });
 

common/content/commandline.js

@@ -1617,7 +1617,7 @@ const CommandLine = Module("commandline", {
              "stringlist", "google",
              {
                  completer: function completer(value) {
-                     let engines = services.get("search").getEngines({})
+                     let engines = services.get("search").getVisibleEngines({})
                                            .filter(function (engine) engine.supportsResponseType("application/x-suggestions+json"));
 
                      return engines.map(function (engine) [engine.alias, engine.description]);

common/content/events.js

@@ -241,16 +241,17 @@ const Events = Module("events", {
     },
 
     /**
-     * Deletes all macros matching <b>filter</b>.
+     * Deletes the specified macros. The <b>filter</b> is a list of
+     * macros and ranges are supported. Eg. "ab c d e-k".
+     *
+     * @param {string} filter The list of macros to delete.
      *
-     * @param {string} filter A regular expression filter string. A null
-     *     filter deletes all macros.
      */
     deleteMacros: function (filter) {
-        let re = RegExp(filter);
+        let re = RegExp("[" + filter.replace(/\s+/g, "") + "]");
 
         for (let [item, ] in this._macros) {
-            if (re.test(item) || !filter)
+            if (re.test(item))
                 this._macros.remove(item);
         }
     },
@@ -1181,6 +1182,7 @@ const Events = Module("events", {
             this._fullscreen = window.fullScreen;
             liberator.triggerObserver("fullscreen", this._fullscreen);
             autocommands.trigger("Fullscreen", { state: this._fullscreen });
+            statusline.setVisibility(statusline.setVisibility.FULLSCREEN);
         }
     }
 }, {

common/content/hints.js

@@ -1332,7 +1332,9 @@ const Hints = Module("hints", {
                 completer: function (context) [
                     ["0123456789", "Numbers only"],
                     ["hjklasdf", "Home row"],
+                    ["dhtnaoeu", "Home row (Dvorak)"],
                     ["hjklasdfgyuiopqwertnmzxcvb", "Smart order"],
+                    ["dhtnaoeuifgcrl',.pybm;qjkx", "Smart order (Dvorak)"],
                     ["abcdefghijklmnopqrstuvwxyz", "Alphabetically ordered"],
                 ],
                 validator: function (arg) {

common/content/modes.js

@@ -104,6 +104,7 @@ const Modes = Module("modes", {
                 if (oldExtended & modes.HINTS)
                     hints.hide();
                 commandline.close();
+                statusline.setVisibility(statusline.setVisibility.MODE_OFF);
                 break;
         }
 
@@ -119,6 +120,11 @@ const Modes = Module("modes", {
         } else if (newMode === modes.COMPOSE) {
             services.get("focus").clearFocus(window);
         }
+
+        if (newMode == modes.COMMAND_LINE) {
+            statusline.setVisibility(statusline.setVisibility.MODE_ON);
+        }
+
     },
 
     NONE: 0,

common/content/quickmarks.js

@@ -158,6 +158,13 @@ const QuickMarks = Module("quickmarks", {
             },
             { arg: true });
 
+        mappings.add(myModes,
+            ["gw"], "Jump to a QuickMark in a new window",
+            function (arg) {
+                quickmarks.jumpTo(arg, liberator.NEW_WINDOW);
+            },
+            { arg: true });
+
         mappings.add(myModes,
             ["M"], "Add new QuickMark for current URL",
             function (arg) {

common/content/statusline.js

@@ -72,6 +72,8 @@ const StatusLine = Module("statusline", {
         // our status bar fields
         this._statusfields = {};
         this._statuslineWidget = document.getElementById("liberator-status");
+        // initialize setVisibility static variables
+        this.setVisibility(-1);
     },
 
     /**
@@ -123,6 +125,63 @@ const StatusLine = Module("statusline", {
         }
     },
 
+    // set the visibility of the statusline
+    setVisibility: function (request) {
+        if ( typeof this.setVisibility.currVisibility == 'undefined' ) {
+            this.setVisibility.currVisibility = true;
+            this.setVisibility.prevVisibility = true;
+            this.setVisibility.contentSeparator
+                = highlight.get('ContentSeparator').value;
+
+            // kinds of requests
+            this.setVisibility.MODE_ON  = 0;      // commandline active
+            this.setVisibility.MODE_OFF = 1;      // commandline inactive
+            this.setVisibility.TOGGLE = 2;        // toggle on or off
+            this.setVisibility.FULLSCREEN = 3;    // in or out of fullscreen
+        }
+
+        const bb = document.getElementById("liberator-bottombar");
+        const sv = this.setVisibility;
+
+        if (!bb) return;
+
+        var toggle_off = function () {
+            bb.style.height = '0px';
+            bb.style.overflow = 'hidden';
+            highlight.set('ContentSeparator', 'display: none;');
+        };
+
+        var toggle_on = function () {
+            bb.style.height = '';
+            bb.style.overflow = '';
+            highlight.set('ContentSeparator', sv.contentSeparatorValue);
+        };
+
+        switch (request) {
+        case sv.TOGGLE:
+            sv.currVisibility = !sv.currVisibility;
+            if (sv.currVisibility) toggle_on();
+            else toggle_off();
+            break;
+        case sv.FULLSCREEN:
+            if (window.fullScreen) {
+                sv.prevVisibility = sv.currVisibility;
+                sv.currVisibility = false;
+                toggle_off();
+            } else {
+                sv.currVisibility = sv.currVisibility || sv.prevVisibility;
+                if (sv.currVisibility) toggle_on();
+            }
+            break;
+        case sv.MODE_ON:
+            if (!sv.currVisibility) toggle_on();
+            break;
+        case sv.MODE_OFF:
+            if (!sv.currVisibility) toggle_off();
+            break;
+        }
+    },
+
     /**
      * Set any field in the statusbar
      *
@@ -155,32 +214,48 @@ const StatusLine = Module("statusline", {
             });
         statusline.addField("ssl", "The currently SSL status", "liberator-status-ssl",
             function updateSSLState (node, state) {
-                var className = "";
+                var className = "notSecure";
+                var tooltip = gNavigatorBundle.getString("identity.unknown.tooltip");
                 if (!state) {
                     let securityUI = config.tabbrowser.securityUI;
                     if (securityUI)
                         state = securityUI.state || 0;
                 }
                 const WPL = Components.interfaces.nsIWebProgressListener;
-                if (state & WPL.STATE_IDENTITY_EV_TOPLEVEL)
+                if (state & WPL.STATE_IDENTITY_EV_TOPLEVEL) {
                     className = "verifiedIdentity";
-                else if (state & WPL.STATE_IS_SECURE)
+                    if (state & WPL.STATE_BLOCKED_MIXED_ACTIVE_CONTENT)
+                        className = "mixedActiveBlocked";
+                    tooltip = gNavigatorBundle.getFormattedString(
+                        "identity.identified.verifier",
+                        [gIdentityHandler.getIdentityData().caOrg]);
+                } else if (state & WPL.STATE_IS_SECURE) {
                     className = "verifiedDomain";
-                else if (state & WPL.STATE_IS_BROKEN) {
-                    if ((state & WPL.STATE_LOADED_MIXED_ACTIVE_CONTENT) &&
-                        options.getPref("security.mixed_content.block_active_content", false))
+                    if (state & WPL.STATE_BLOCKED_MIXED_ACTIVE_CONTENT)
+                        className = "mixedActiveBlocked";
+                    tooltip = gNavigatorBundle.getFormattedString(
+                        "identity.identified.verifier",
+                        [gIdentityHandler.getIdentityData().caOrg]);
+                } else if (state & WPL.STATE_IS_BROKEN) {
+                    if (state & WPL.STATE_LOADED_MIXED_ACTIVE_CONTENT)
                         className = "mixedActiveContent";
+                    else
+                        className = "mixedDisplayContent";
+                    tooltip = gNavigatorBundle.getString("identity.unknown.tooltip");
                 }
-
                 node.className = className;
+                node.setAttribute("tooltiptext", tooltip);
             }, {
                 openPopup: function (anchor) {
                     var handler = window.gIdentityHandler;
                     if (typeof handler === "undefiend") // Thunderbird has none
                         return;
 
+                    if (handler.refreshIdentityPopup)
+                        handler.refreshIdentityPopup();
+                    else
+                        handler.setPopupMessages(handler._identityBox.className);
                     handler._identityPopup.hidden = false;
-                    handler.setPopupMessages(handler._identityBox.className);
                     handler._identityPopup.openPopup(anchor);
                 },
             });

common/content/tabs.js

@@ -1170,7 +1170,7 @@ const Tabs = Module("tabs", {
                             styles.addSheet(true, "tabnumbers", "chrome://*",
                                 // we need to change the visible of the "new tab" buttons because the "inline" "new tab" button in the toolbar
                                 // gets moved just after the last app tab with tab numbers on
-                                "#TabsToolbar { counter-reset:tabnumber; } #TabsToolbar tab::after { counter-increment:tabnumber; content:counter(tabnumber); font:bold 0.84em monospace; cursor: default; } #TabsToolbar tab:not([pinned])::after { display:block; padding-bottom:0.4em; } .tabs-newtab-button { display: none !important; } #new-tab-button { visibility: visible !important; }"
+                                "#TabsToolbar { counter-reset:tabnumber; } #TabsToolbar tab::after { counter-increment:tabnumber; content:counter(tabnumber); font:bold 0.84em monospace; cursor: default; background-image: none !important; opacity: 1 !important; } #TabsToolbar tab:not([pinned])::after { display:block; padding-bottom:0.4em; } .tabs-newtab-button { display: none !important; } #new-tab-button { visibility: visible !important; }"
                             );
                         else
                             styles.removeSheet(true, "tabnumbers");

common/content/util.js

@@ -827,7 +827,7 @@ const Util = Module("util", {
             return {
                 __proto__: ary,
                 __iterator__: function () this.iteritems(),
-                __noSuchMethod__: function (meth, args) {
+                mapImpl: function (meth, args) {
                     var res = util.Array[meth].apply(null, [this.__proto__].concat(args));
 
                     if (util.Array.isinstance(res))
@@ -836,7 +836,8 @@ const Util = Module("util", {
                 },
                 toString: function () this.__proto__.toString(),
                 concat: function () this.__proto__.concat.apply(this.__proto__, arguments),
-                map: function () this.__noSuchMethod__("map", Array.slice(arguments))
+                map: function () this.mapImpl("map", Array.slice(arguments)),
+                flatten: function () this.mapImpl("flatten", arguments)
             };
         }
     }, {