Merge branch 'master' into fix-abclear

* master:
  fix command line Shift+Insert paste on Linux
  Fix #444: Honor hlsearch on n/N
  fix Shift+Insert paste on Linux
  use saniztizer based on app platform version, #556
  Remove asciidoc.conf
  Remove regressions.js
  Fix #259: Command prompt selection sometimes cleared
  Fix misspellings (#546)
  Optimize vimperator-labs-white.png and about_background.png, reduce file size with optipng
  Disallow units for zero values (#541)
  help.css: Disallow overqualified elements (#540)

Author: amlitzer

CONTRIBUTING.md

@@ -210,7 +210,6 @@ Testing/Optimization
 **TODO:**
 
 - Add some information here about testing/validation/etc.
-- Information about how/when to use `:regressions` might be nice.
 - Additionally, maybe there should be some benchmark information here,
   something to let a developer know what's "too" slow...? Or general guidelines
   about optimization?

assets/logos/vimperator-labs-white.png

@@ -1270,7 +1270,7 @@ const CommandLine = Module("commandline", {
             this._lastSubstring = substring;
 
             let value = this.completion;
-            if (util.compareIgnoreCase(value, substring.substr(0, value.length)))
+            if (value.length == substring.length || util.compareIgnoreCase(value, substring.substr(0, value.length)))
                 return;
             substring = substring.substr(value.length);
             this.removeSubstring = substring;

common/asciidoc.conf

@@ -617,7 +617,7 @@ const CompletionContext = Class("CompletionContext", {
      * @param {boolean} interruptible When true, the call may be interrupted
      *    via <C-c>, in which case, "Interrupted" may be thrown.
      * @param {number} timeout The maximum time, in milliseconds, to wait.
-     *    If 0 or null, wait indefinately.
+     *    If 0 or null, wait indefinitely.
      */
     wait: function wait(interruptable, timeout) {
         let end = Date.now() + timeout;

common/content/commandline.js

@@ -70,6 +70,10 @@ const Editor = Module("editor", {
                 return;
             }
 
+            // clear completion preview so it does not get turned into regular text
+            if (commandline._completions)
+                commandline._completions.previewClear();
+
             let elem = liberator.focus;
 
             if (elem.setSelectionRange && util.readFromClipboard()) {
@@ -83,13 +87,18 @@ const Editor = Module("editor", {
                 let rangeEnd = elem.selectionEnd;
                 let tempStr1 = elem.value.substring(0, rangeStart);
                 let tempStr2 = util.readFromClipboard();
-                elem.value = tempStr1 + tempStr2;
+                let tempStr3 = elem.value.substring(rangeEnd);
+                elem.value = tempStr1 + tempStr2 + tempStr3;
                 elem.selectionStart = rangeStart + tempStr2.length;
                 elem.selectionEnd = elem.selectionStart;
 
                 elem.scrollTop = curTop;
                 elem.scrollLeft = curLeft;
             }
+
+            // update completion preview as would happen with Ctrl+v or mouse paste
+            if (commandline._completions && options.autocomplete)
+                commandline._completions.complete(true, false);
     },
 
     // count is optional, defaults to 1

common/content/completion.js

@@ -181,6 +181,10 @@ var Finder = Module("finder", {
         this.findbar._vimp_keepClosed = true;
 
         this.findbar.onFindAgainCommand(reverse);
+
+        if (options.hlsearch) {
+            this.highlight();
+        }
     },
 
     /**
@@ -253,13 +257,18 @@ var Finder = Module("finder", {
     },
 
     /**
-     * Highlights all occurances of <b>str</b> in the buffer.
+     * Highlights all occurrences of <b>str</b> in the buffer.
      */
     highlight: function () {
         this.setupFindbar();
         let findbar = this.findbar;
 
         let btn = findbar.getElement("highlight");
+
+        if (btn.checked) {
+            return;
+        }
+
         btn.checked = true;
 
         findbar._setHighlightTimeout();

common/content/editor.js

@@ -1,4 +1,4 @@
-div.main {
+.main {
     font-family: -moz-fixed;
     white-space: -moz-pre-wrap;
     width: 800px;
@@ -10,7 +10,7 @@ h1 {
     text-align: center;
 }
 
-p.tagline {
+.tagline {
     text-align: center;
     font-weight: bold;
 }
@@ -25,7 +25,7 @@ table.vimperator td {
     border: none;
     padding: 3px;
 }
-tr.separator {
+.separator {
     height: 10px;
 }
 hr {
@@ -42,39 +42,39 @@ td.taglist {
 }
 td.taglist td {
     width: 100px;
-    padding: 3px 0px;
+    padding: 3px 0;
 }
 tr.taglist code, td.usage code {
-    margin: 0px 2px;
+    margin: 0 2px;
 }
 td.usage code {
     white-space: nowrap;
 }
 td.taglist code {
     margin-left: 2em;
 }
-code.tag {
+.tag {
     font-weight: bold;
     color: rgb(255, 0, 255); /* magenta */
     padding-left: 5px;
 }
-tr.description {
+.description {
     margin-bottom: 4px;
 }
-table.commands {
+.commands {
     background-color: rgb(250, 240, 230);
     color: black;
 }
-table.mappings {
+.mappings {
     background-color: rgb(230, 240, 250);
     color: black;
 }
-table.options {
+.options {
     background-color: rgb(240, 250, 230);
     color: black;
 }
 
-fieldset.paypal {
+.paypal {
     border: none;
 }
 

common/content/finder.js

@@ -207,7 +207,7 @@ const Hints = Module("hints", {
                 let leftBound = Infinity;
                 let topBound = Infinity;
 
-                // First find the top-left corner of the bounding rectangle (offset from image topleft can be noticably suboptimal)
+                // First find the top-left corner of the bounding rectangle (offset from image topleft can be noticeably suboptimal)
                 for (let i = 0; i < coords.length; i += 2) {
                     leftBound = Math.min(coords[i], leftBound);
                     topBound = Math.min(coords[i + 1], topBound);
@@ -844,8 +844,8 @@ const Hints = Module("hints", {
         /**
          * Get a hint matcher for hintmatching=fuzzy
          *
-         * The user input can be anything. The matcher looks for occurances of
-         * the characters in the user input. If all occurances are found in the
+         * The user input can be anything. The matcher looks for occurrences of
+         * the characters in the user input. If all occurrences are found in the
          * link, in order, the link is relevant.
          *
          * @param {string} hintString The string typed by the user.

common/content/help.css

@@ -432,7 +432,7 @@ const JavaScript = Module("javascript", {
     _getKey: function () {
         if (this._last == "")
             return "";
-        // After the opening [ upto the opening ", plus '' to take care of any operators before it
+        // After the opening [ up to the opening ", plus '' to take care of any operators before it
         let key = this._str.substring(this._get(-2, 0, "statements"), this._get(-1, null, "offset")) + "''";
         // Now eval the key, to process any referenced variables.
         return this.eval(key);
@@ -496,7 +496,7 @@ const JavaScript = Module("javascript", {
                  if (this._get(-3, 0, "statements") == this._get(-2).offset)
                     return null;
 
-                // Beginning of the statement upto the opening [
+                // Beginning of the statement up to the opening [
                 let obj = this._getObj(-3, this._get(-2).offset);
 
                 return this._complete(obj, this._getKey(), null, string, this._last);