important autocomplete fixes

Author: nikitaeverywhere

package.json

@@ -3,8 +3,8 @@
   "title": "Cache WEB Terminal",
   "description": "Web-based terminal emulator for Caché administering.",
   "author": "ZitRo",
-  "version": "2.0.0-beta.4",
-  "releaseNumber": "6",
+  "version": "2.0.0-beta.5",
+  "releaseNumber": "7",
   "repository": {
     "type": "git",
     "url": "https://github.com/intersystems-ru/webterminal.git"
@@ -13,8 +13,8 @@
     "grunt": ">=0.4.5",
     "grunt-contrib-clean": ">=0.6.0",
     "grunt-contrib-concat": ">=0.5.0",
-    "grunt-contrib-copy": ">=0.5.0",
+    "grunt-contrib-copy": "^0.7.0",
     "grunt-contrib-uglify": ">=0.6.0",
-    "grunt-preprocess": ">=4.0.0"
+    "grunt-preprocess": "^4.1.0"
   }
-}
+}

webSource/js/TerminalAutocomplete.js

@@ -61,7 +61,7 @@ TerminalAutocomplete.prototype.TYPES = {
     },
     subclass: {
         regExp: /##class\((%?[a-zA-Z]*[a-zA-Z0-9\.]*)\)\.(%?[a-zA-Z]*[a-zA-Z0-9]*)$/,
-        priority: 1
+        priority: 2
     },
     globals: {
         regExp: /\^(%?[a-z0-9A-Z]*)/
@@ -141,11 +141,14 @@ TerminalAutocomplete.prototype.getEndings = function (string) {
 
         MAX_LENGTH = 60; // limit the AC length for performance reasons
 
-    string = string.substr(string.length - MAX_LENGTH, MAX_LENGTH);
-
-    // skip strings
+    // skip autocomplete in strings
     if ((string.match(/"/g) || []).length % 2 === 1) return [];
 
+    string = string.substr(
+        Math.max(string.length - MAX_LENGTH, 0),
+        Math.min(MAX_LENGTH, string.length)
+    );
+
     for (i in this.TYPES) {
         matcher = this.TYPES[i].regExp || this.TYPES.common.regExp;
         trieString = (string.match(matcher) || []).slice(1).join("\n");
@@ -154,7 +157,7 @@ TerminalAutocomplete.prototype.getEndings = function (string) {
                 variants = {};
                 priority = this.TYPES[i].priority;
                 this._appendEndings(variants, trieString, this.TYPES[i]);
-            } else if (this.TYPES[i].priority || 0 === priority) {
+            } else if ((this.TYPES[i].priority || 0) === priority) {
                 this._appendEndings(variants, trieString, this.TYPES[i]);
             } // else do not append
         }

webSource/js/TerminalInput.js

@@ -75,7 +75,6 @@ var TerminalInput = function (TERMINAL) {
      * Shows the input beginning position.
      *
      * @type {{line: number, position: number}}
-     * @private
      */
     this.INITIAL_POSITION = {
         line: 0,
@@ -133,13 +132,10 @@ TerminalInput.prototype.focus = function () {
  */
 TerminalInput.prototype.set = function (text) {
 
-    var element = this.TERMINAL.elements.input,
-        length;
+    var element = this.TERMINAL.elements.input;
 
     element.value = text;
-    length = element.value.length;
-    this.setCaretPosition(length);
-    //setTimeout(function() { _._onInput(); }, 1);
+    this.setCaretPosition(element.value.length);
     this._onInput();
 
 };
@@ -229,7 +225,7 @@ TerminalInput.prototype._changeAutocompleteVariant = function (delta) {
     this._currentAutocompleteVariant = (this._currentAutocompleteVariant + delta)
         % this._autocompleteVariants.length || 0;
     if (this._currentAutocompleteVariant < 0) this._currentAutocompleteVariant
-        += this._autocompleteVariants.length;
+        += this._autocompleteVariants.length || 0;
     this._updateAutocompleteView();
 
 };
@@ -262,6 +258,7 @@ TerminalInput.prototype._updateAutocompleteView = function () {
 TerminalInput.prototype.clearAutocompleteVariants = function () {
 
     this._autocompleteVariants = [];
+    this._currentAutocompleteVariant = 0;
 
 };
 
@@ -290,6 +287,7 @@ TerminalInput.prototype._onInput = function () {
             this.TERMINAL.autocomplete.getEndings(
                 value.substring(0, this.getCaretPosition())
             );
+        this._changeAutocompleteVariant(0);
     }
 
     this.TERMINAL.output.printAtLine(

webSource/js/TerminalInputHistory.js

@@ -40,9 +40,13 @@ TerminalInputHistory.prototype.initialize = function () {
         if (event.keyCode === 38) { // UP
             _this.seek(-1);
             _this.INPUT.set(_this.getCurrent());
+            event.preventDefault();
+            event.cancelBubble();
         } else if (event.keyCode === 40) { // DOWN
             _this.seek(1);
             _this.INPUT.set(_this.getCurrent());
+            event.preventDefault();
+            event.cancelBubble();
         }
     });