Attempt to fix Hint compatibility problem (WIP)
Change-Id: I3016afc2f74b90c223dd4f8f2386b71aab1eedcd
diff --git a/dev/js/src/hint/alert.js b/dev/js/src/hint/alert.js
index 768d719..c8d7696 100644
--- a/dev/js/src/hint/alert.js
+++ b/dev/js/src/hint/alert.js
@@ -1,26 +1,45 @@
/**
- * Hint menu alert
+ * Hint menu alert, positioned at the exact char.
*/
+"use strict";
+
define(function () {
- "use strict";
+
return {
+
+ /**
+ * Construct a new alert object
+ */
create : function (msg) {
return Object.create(this)._init(msg);
},
+
+ // Init
_init : function (msg) {
- this._type = 'alert';
- this.active = false;
- this._element = document.createElement('div');
- this._element.style.display = 'none';
- this._element.classList.add('alert', 'hint');
- return this;
- },
- show : function (msg) {
- this._element.textContent = msg;
- this.active = true;
- this._element.style.display = 'block';
+ const t = this;
+ t._type = 'alert';
+ t.active = false;
+ t._element = document.createElement('div');
+ t._element.style.display = 'none';
+ t._element.classList.add('alert', 'hint');
+ return t;
},
+
+ /**
+ * Show alert.
+ */
+ show : function (msg) {
+ this.active = true;
+ const e = this._element;
+ e.textContent = msg;
+ e.style.display = 'block';
+ },
+
+
+ /**
+ * Hide alert.
+ */
hide : function () {
if (!this.active)
return false;
@@ -29,6 +48,10 @@
return true;
},
+
+ /**
+ * Get alert object.
+ */
element : function () {
return this._element;
}
diff --git a/dev/js/src/hint/contextanalyzer.js b/dev/js/src/hint/contextanalyzer.js
index fc01662..7030cb9 100644
--- a/dev/js/src/hint/contextanalyzer.js
+++ b/dev/js/src/hint/contextanalyzer.js
@@ -1,6 +1,8 @@
/**
* Regex object for checking the context of the hint
*/
+"use strict";
+
define({
/**
diff --git a/dev/js/src/hint/foundries.js b/dev/js/src/hint/foundries.js
index 256ee76..ce6ef43 100644
--- a/dev/js/src/hint/foundries.js
+++ b/dev/js/src/hint/foundries.js
@@ -1,22 +1,21 @@
-window.KorAP = window.KorAP || {};
KorAP.annotationHelper = KorAP.annotationHelper || { '-' : [] };
-define([], function () {
- "use strict";
+"use strict";
+
+define(["util"], function () {
const ah = KorAP.annotationHelper;
- ah["getDesc"] = function (foundryLayer, value) {
+ ah.getDesc = function (foundryLayer, value) {
if (!foundryLayer)
return;
- var anno = this[foundryLayer];
+ let anno = this[foundryLayer];
if (!anno)
return;
- // if (value.indexOf(':') < 0) {
if (!value.includes(':')) {
value += ' ';
@@ -35,16 +34,15 @@
return;
}
- else {
- var text = '';
- var v = value.split(":");
- var l1 = v[0];
- var l2 = v[1];
- l1 += ':';
+ else {
+ const v = value.split(":");
+ let l1 = v[0] + ':';
+ let l2 = v[1] + ' ';
+ let text = '';
// Add key description
- for (var i = 0; i < anno.length; i++) {
+ for (let i = 0; i < anno.length; i++) {
if (anno[i] &&
anno[i][1] == l1) {
if (anno[i][2])
@@ -65,10 +63,8 @@
if (!anno)
return;
- l2 += ' ';
-
// Add value description
- for (var i = 0; i < anno.length; i++) {
+ for (let i = 0; i < anno.length; i++) {
if (anno[i] &&
anno[i][1] == l2) {
if (anno[i][2])
diff --git a/dev/js/src/hint/input.js b/dev/js/src/hint/input.js
index 120a953..d779776 100644
--- a/dev/js/src/hint/input.js
+++ b/dev/js/src/hint/input.js
@@ -1,194 +1,203 @@
// Input field for queries
/*
- * TODO: Support allert for query problems.
+ * TODO: Support alert for query problems.
*/
-define({
+"use strict";
- /**
- * Create a new input field.
- */
- create : function (element) {
- return Object.create(this)._init(element);
- },
+define(['util'], function () {
+
+ return {
+
+ /**
+ * Create a new input field.
+ */
+ create : function (element) {
+ return Object.create(this)._init(element);
+ },
- /**
- * Get the mirrored input field.
- */
- mirror : function () {
- return this._mirror;
- },
+ // Initialize new input field
+ _init : function (element) {
+ this._element = element;
+
+ this._container = document.createElement("div");
+ this._container.setAttribute('id', 'hint');
+
+ // Create mirror for searchField
+ // This is important for positioning
+ // if ((this._mirror = document.getElementById("searchMirror")) === null) {
+ this._mirror = document.createElement("div");
+ const m = this._mirror;
+ m.classList.add('hint', 'mirror');
+ m.addE("span");
+ m.appendChild(this._container);
+ m.style.height = "0px";
+ document.getElementsByTagName("body")[0].appendChild(m);
+
+ // Update position of the mirror
+ const re = this.reposition.bind(this);
+ window.addEventListener('resize', re);
+ this._element.addEventListener('onfocus', re);
+ this.reposition();
+ return this;
+ },
- /**
- * Get the container element.
- * This contains the hint helper / menus
- * and probably an
- * error message.
- */
- container : function () {
- return this._container;
- },
+ /**
+ * Get the mirrored input field.
+ */
+ mirror : function () {
+ return this._mirror;
+ },
- /**
- * Get the input element the
- * hint helper is attached to.
- */
- element : function () {
- return this._element;
- },
+ /**
+ * Get the container element.
+ * This contains the hint helper / menus
+ * and probably an
+ * error message.
+ */
+ container : function () {
+ return this._container;
+ },
- /**
- * Get the value of the input field
- * the hint helper is attached to.
- */
- value : function () {
- return this._element.value;
- },
+ /**
+ * Get the input element the
+ * hint helper is attached to.
+ */
+ element : function () {
+ return this._element;
+ },
- /**
- * Get the value of the input field mirror.
- */
- mirrorValue : function () {
- return this._mirror.firstChild.textContent;
- },
+ /**
+ * Get the value of the input field
+ * the hint helper is attached to.
+ */
+ value : function () {
+ return this._element.value;
+ },
- /**
- * Reset the input value
- */
- reset : function () {
- this._element.value = "";
- },
+ /**
+ * Get the value of the input field mirror.
+ */
+ mirrorValue : function () {
+ return this._mirror.firstChild.textContent;
+ },
- /**
- * Update the mirror content.
- */
- update : function () {
- this._mirror.firstChild.textContent = this._split()[0];
- this._container.style.left = this._rightPos() + 'px';
- return this;
- },
+ /**
+ * Reset the input value
+ */
+ reset : function () {
+ this._element.value = "";
+ },
- /**
- * Insert text into the mirror.
- * This is a prefix of the input field's
- * value.
- */
- insert : function (text) {
- var splittedText = this._split();
- var s = this._element;
- s.value = splittedText[0] + text + splittedText[1];
- s.selectionStart = (splittedText[0] + text).length;
- s.selectionEnd = s.selectionStart;
-
- // Maybe update?
- this._mirror.firstChild.textContent = splittedText[0] + text;
- return this;
- },
-
- /**
- * Move hinthelper to given character position
- */
- moveto : function (charpos) {
- this._element.selectionStart = charpos;
- this._element.selectionEnd = charpos;
- this._element.focus();
- return this.update();
- },
-
- /**
- * Reposition the input mirror directly
- * below the input box.
- */
- reposition : function () {
- var inputClientRect = this._element.getBoundingClientRect();
- var inputStyle = window.getComputedStyle(this._element, null);
-
- var bodyClientRect =
- document.getElementsByTagName('body')[0].getBoundingClientRect();
-
- // Reset position
- var mirrorStyle = this._mirror.style;
- mirrorStyle.left = parseInt(inputClientRect.left) + "px";
- mirrorStyle.top = parseInt(inputClientRect.bottom - bodyClientRect.top) + "px";
- mirrorStyle.width = inputStyle.getPropertyValue("width");
-
- // These may be relevant in case of media depending css
- mirrorStyle.paddingLeft = inputStyle.getPropertyValue("padding-left");
- mirrorStyle.marginLeft = inputStyle.getPropertyValue("margin-left");
- mirrorStyle.borderLeftWidth = inputStyle.getPropertyValue("border-left-width");
- mirrorStyle.borderLeftStyle = inputStyle.getPropertyValue("border-left-style");
- mirrorStyle.fontSize = inputStyle.getPropertyValue("font-size");
- mirrorStyle.fontFamily = inputStyle.getPropertyValue("font-family");
- },
+ /**
+ * Update the mirror content.
+ */
+ update : function () {
+ this._mirror.firstChild.textContent = this._split()[0];
+ this._container.style.left = this._rightPos() + 'px';
+ return this;
+ },
- /**
- * Get the context, which is the input
- * field's value bounded to the
- * cursor position.
- */
- context : function () {
- return this._split()[0];
- },
+ /**
+ * Insert text into the mirror.
+ * This is a prefix of the input field's
+ * value.
+ */
+ insert : function (text) {
+ const splittedText = this._split();
+ const s = this._element;
+ s.value = splittedText[0] + text + splittedText[1];
+ s.selectionStart = (splittedText[0] + text).length;
+ s.selectionEnd = s.selectionStart;
+
+ // Maybe update?
+ this._mirror.firstChild.textContent = splittedText[0] + text;
+ return this;
+ },
- // Initialize new input field
- _init : function (element) {
- this._element = element;
-
- // Create mirror for searchField
- // This is important for positioning
- // if ((this._mirror = document.getElementById("searchMirror")) === null) {
- this._mirror = document.createElement("div");
- this._mirror.classList.add('hint', 'mirror');
- this._mirror.appendChild(document.createElement("span"));
- this._container = document.createElement("div");
- this._container.setAttribute('id', 'hint');
-
- this._mirror.appendChild(this._container);
- this._mirror.style.height = "0px";
- document.getElementsByTagName("body")[0].appendChild(this._mirror);
- // };
-
- // Update position of the mirror
- window.addEventListener('resize', this.reposition.bind(this));
- this._element.addEventListener('onfocus', this.reposition.bind(this));
- this.reposition();
- return this;
- },
+ /**
+ * Move hinthelper to given character position
+ */
+ moveto : function (charpos) {
+ const e = this._element;
+ e.selectionStart = charpos;
+ e.selectionEnd = charpos;
+ e.focus();
+ return this.update();
+ },
- // Get the right position
- _rightPos : function () {
- var box = this._mirror.firstChild.getBoundingClientRect();
- return box.right - box.left;
- },
+ /**
+ * Reposition the input mirror directly
+ * below the input box.
+ */
+ reposition : function () {
+ const inputClientRect = this._element.getBoundingClientRect();
+ const inputStyle = window.getComputedStyle(this._element, null);
+
+ const bodyClientRect =
+ document.getElementsByTagName('body')[0].getBoundingClientRect();
+
+ // Reset position
+ const mirrorStyle = this._mirror.style;
+ mirrorStyle.left = parseInt(inputClientRect.left) + "px";
+ mirrorStyle.top = parseInt(inputClientRect.bottom - bodyClientRect.top) + "px";
+ mirrorStyle.width = inputStyle.getPropertyValue("width");
+
+ // These may be relevant in case of media depending css
+ mirrorStyle.paddingLeft = inputStyle.getPropertyValue("padding-left");
+ mirrorStyle.marginLeft = inputStyle.getPropertyValue("margin-left");
+ mirrorStyle.borderLeftWidth = inputStyle.getPropertyValue("border-left-width");
+ mirrorStyle.borderLeftStyle = inputStyle.getPropertyValue("border-left-style");
+ mirrorStyle.fontSize = inputStyle.getPropertyValue("font-size");
+ mirrorStyle.fontFamily = inputStyle.getPropertyValue("font-family");
+ },
- /*
- * Return two substrings,
- * splitted at a given position
- * or at the current cursor position.
- */
- _split : function (start) {
- var s = this._element;
- var value = s.value;
+ /**
+ * Get the context, which is the input
+ * field's value bounded to the
+ * cursor position.
+ */
+ context : function () {
+ return this._split()[0];
+ },
- // Get start from cursor position
- if (arguments.length === 0)
- start = s.selectionStart;
- return new Array(
- value.substring(0, start),
- value.substring(start, value.length)
- );
+ // Get the right position
+ _rightPos : function () {
+ const box = this._mirror.firstChild.getBoundingClientRect();
+ return box.right - box.left;
+ },
+
+
+ /*
+ * Return two substrings,
+ * splitted at a given position
+ * or at the current cursor position.
+ */
+ _split : function (start) {
+ const s = this._element;
+ const value = s.value;
+
+ // Get start from cursor position
+ if (arguments.length === 0)
+ start = s.selectionStart;
+
+ return new Array(
+ value.substring(0, start),
+ value.substring(start, value.length)
+ );
+ }
}
});
diff --git a/dev/js/src/hint/lengthField.js b/dev/js/src/hint/lengthField.js
index 541b917..79c7b7d 100644
--- a/dev/js/src/hint/lengthField.js
+++ b/dev/js/src/hint/lengthField.js
@@ -1,3 +1,5 @@
+"use strict";
+
define(['menu/lengthField', 'util'], function (lengthFieldClass) {
return {
diff --git a/dev/js/src/hint/menu.js b/dev/js/src/hint/menu.js
index a9a3fb2..bf1a04b 100644
--- a/dev/js/src/hint/menu.js
+++ b/dev/js/src/hint/menu.js
@@ -1,6 +1,9 @@
/**
* Hint menu
*/
+
+"use strict";
+
define([
'menu',
'hint/item',
diff --git a/dev/js/src/hint/prefix.js b/dev/js/src/hint/prefix.js
index dc14d5c..197e36e 100644
--- a/dev/js/src/hint/prefix.js
+++ b/dev/js/src/hint/prefix.js
@@ -1,3 +1,5 @@
+"use strict";
+
define(['menu/prefix'], function (prefixClass) {
return {