Fixed regression and message text

uuf6429 · May 27, 2017 · e6675bc · e6675bc
1 parent 8db4994
commit e6675bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/Server/Preload.js b/src/Server/Preload.js
@@ -371,11 +371,12 @@
          * @param {String} rdEventType
          */
         'handleMouseEventOnce': function (rdEventType) {
-            const rdEventTypeToJsEventMap = {
-                'mouseMoved': 'mousemove',
-                'mousePressed': 'mousedown',
-                'mouseReleased': 'mouseup'
-            };
+            const self = this,
+                rdEventTypeToJsEventMap = {
+                    'mouseMoved': 'mousemove',
+                    'mousePressed': 'mousedown',
+                    'mouseReleased': 'mouseup'
+                };
 
             if (!rdEventTypeToJsEventMap[rdEventType]) {
                 throw new Error('RemoteDebug event named "' + rdEventType + '" is not supported.');
@@ -385,7 +386,7 @@
                 rdEventTypeToJsEventMap[rdEventType],
                 function (event) {
                     setMouseEventTriggered(
-                        (event && event.target) ? this.getElementSelector(event.target) : 'unknown'
+                        (event && event.target) ? self._getElementSelector(event.target) : 'unknown'
                     );
                 },
                 {catpure: true, once: true}
@@ -396,16 +397,16 @@
          * @param {HTMLElement} element
          * @returns {String}
          */
-        'getElementSelector': function (element){
+        '_getElementSelector': function (element){
             if (element.id) {
                 return '#' + element.id;
             }
 
             let parent = element.parentNode;
-            let selector = '>' + element.nodeName + ':nth-child(' + this.getElementIndex(element) + ')';
+            let selector = '>' + element.nodeName + ':nth-child(' + this._getElementIndex(element) + ')';
 
             while (!parent.id && parent.nodeName.toLowerCase() !== 'body') {
-                selector = '>' + element.nodeName + ':nth-child(' + this.getElementIndex(parent) + ')' + selector;
+                selector = '>' + element.nodeName + ':nth-child(' + this._getElementIndex(parent) + ')' + selector;
                 parent = parent.parentNode;
             }
 
@@ -422,7 +423,7 @@
          * @param {Node} element
          * @returns {Number}
          */
-        'getElementIndex': function(element) {
+        '_getElementIndex': function(element) {
             let i = 0;
             while (!!(element = element.previousSibling)) i++;
             return i;

diff --git a/src/Server/Server.js b/src/Server/Server.js
@@ -882,7 +882,7 @@ Electron.app.on('ready', function() {
                         );
                     })
                     .catch(function (error) {
-                        Logger.error('Could create mouse event listener (%j): %s', params, errorToString(error));
+                        Logger.error('Could not create mouse event listener (%j): %s', params, errorToString(error));
                         executeResponse = {'error': errorToString(error)};
                     });