iobroker.javascript 7.0.5 → 7.0.8

package/admin/google-blockly/own/field_oid.js

@@ -1,3 +1,27 @@
+/**
+ * @license
+ * Visual Blocks Editor
+ *
+ * Copyright 2012 Google Inc.
+ * https://developers.google.com/blockly/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @fileoverview Text input field.
+ * @author fraser@google.com (Neil Fraser)
+ */
 'use strict';
 
 if (typeof goog !== 'undefined') {
@@ -10,82 +34,90 @@ if (typeof goog !== 'undefined') {
     goog.require('goog.userAgent');
 }
 
-class FieldOID extends Blockly.Field {
+/**
+ * Class for an editable text field.
+ * @param {string} text The initial content of the field.
+ * @param {string} type Type of objects (default: state)
+ * @extends {Blockly.Field}
+ * @constructor
+ */
+Blockly.FieldOID = function(text, type) {
+    Blockly.FieldOID.superClass_.constructor.call(this, text);
+    this._type = type;
+};
 
-    constructor(value, type) {
-        super(value);
+if (typeof goog !== 'undefined') {
+    goog.inherits(Blockly.FieldOID, Blockly.Field);
+} else {
+    Blockly.utils.object.inherits(Blockly.FieldOID, Blockly.Field);
+}
 
-        this._type = type;
+/**
+ * Point size of text.  Should match blocklyText's font-size in CSS.
+ */
+Blockly.FieldOID.FONTSIZE = 11;
 
-        this.FONTSIZE = 11;
-        this.CURSOR = 'pointer';
-        this.spellcheck_ = false;
-    }
+/**
+ * Mouse cursor style when over the hotspot that initiates the editor.
+ */
+Blockly.FieldOID.prototype.CURSOR = 'pointer';
+
+/**
+ * Allow browser to spellcheck this field.
+ * @private
+ */
+Blockly.FieldOID.prototype.spellcheck_ = false;
 
-    dispose() {
-        Blockly.WidgetDiv.hideIfOwner(this);
-        super.dispose();
+/**
+ * Close the input widget if this input is being deleted.
+ */
+Blockly.FieldOID.prototype.dispose = function() {
+    Blockly.WidgetDiv.hideIfOwner(this);
+    Blockly.FieldOID.superClass_.dispose.call(this);
+};
+
+/**
+ * Set the text in this field.
+ * @param {?string} id New ID.
+ * @override
+ */
+Blockly.FieldOID.prototype.setValue = function(id) {
+    if (id === null) {
+        return;  // No change if null.
     }
 
-    setValue(id) {
-        if (id === null) {
-            return;  // No change if null.
-        }
-    
-        var objects = window.main.objects;
-    
-        if (objects && !objects[id] && typeof window.main.getObject === 'function') {
-            this._idName = id || Blockly.Field.NBSP;
-            window.main.getObject(id, (err, obj) => {
-                if (obj) {
-                    objects[obj._id] = objects[obj._id] || obj;
-                    var text = objects[obj._id].common && objects[obj._id].common.name && objects[obj._id].common.name;
+    const objects = window.main.objects;
+
+    if (objects && !objects[id] && typeof window.main.getObject === 'function') {
+        this._idName = id || Blockly.Field.NBSP;
+        const that = this;
+        window.main.getObject(id, function (err, obj) {
+            if (obj) {
+                objects[obj._id] = objects[obj._id] || obj;
+                let text = objects[obj._id].common && objects[obj._id].common.name && objects[obj._id].common.name;
+                if (text) {
+                    if (typeof text === 'object') {
+                        text = text[systemLang] || text.en;
+                    }
+                    if (text.length > that.maxDisplayLength) {
+                        // Truncate displayed string and add an ellipsis ('...').
+                        text = text.substring(0, that.maxDisplayLength - 2) + '\u2026';
+                    }
+                    text.trim();
+                    // Replace whitespace with non-breaking spaces so the text doesn't collapse.
+                    text = text.replace(/\s/g, Blockly.Field.NBSP);
+
                     if (text) {
-                        if (typeof text === 'object') {
-                            text = text[systemLang] || text.en;
-                        }
-                        if (text.length > this.maxDisplayLength) {
-                            // Truncate displayed string and add an ellipsis ('...').
-                            text = text.substring(0, this.maxDisplayLength - 2) + '\u2026';
-                        }
-                        text.trim();
-                        // Replace whitespace with non-breaking spaces so the text doesn't collapse.
-                        text = text.replace(/\s/g, Blockly.Field.NBSP);
-    
-                        if (text) {
-                            this._idName = text;
-                            this.forceRerender();
-                        }
+                        that._idName = text;
+                        that.forceRerender();
                     }
                 }
-            });
-        } else {
-            var text = objects && objects[id] && objects[id].common && objects[id].common.name ? objects[id].common.name : id;
-            if (typeof text === 'object') {
-                text = text[systemLang] || text.en;
-            }
-            if (text.length > this.maxDisplayLength) {
-                // Truncate displayed string and add an ellipsis ('...').
-                text = text.substring(0, this.maxDisplayLength - 2) + '\u2026';
             }
-            // Replace whitespace with non-breaking spaces so the text doesn't collapse.
-            text = text.replace(/\s/g, Blockly.Field.NBSP);
-    
-            if (!text) {
-                // Prevent the field from disappearing if empty.
-                text = Blockly.Field.NBSP;
-            }
-            this._idName = text;
-        }
-    
-        super.setValue(id);
-    }
-
-    getDisplayText_() {
-        var text = this._idName || this.text_;
-        if (!text) {
-            // Prevent the field from disappearing if empty.
-            return Blockly.Field.NBSP;
+        });
+    } else {
+        let text = objects && objects[id] && objects[id].common && objects[id].common.name ? objects[id].common.name : id;
+        if (typeof text === 'object') {
+            text = text[systemLang] || text.en;
         }
         if (text.length > this.maxDisplayLength) {
             // Truncate displayed string and add an ellipsis ('...').
@@ -93,123 +125,171 @@ class FieldOID extends Blockly.Field {
         }
         // Replace whitespace with non-breaking spaces so the text doesn't collapse.
         text = text.replace(/\s/g, Blockly.Field.NBSP);
-        if (this.sourceBlock_.RTL) {
-            // The SVG is LTR, force text to be RTL.
-            text += '\u200F';
+
+        if (!text) {
+            // Prevent the field from disappearing if empty.
+            text = Blockly.Field.NBSP;
         }
-        return text;
+        this._idName = text;
     }
 
-    showEditor_(opt_quietInput) {
-        this.workspace_ = this.sourceBlock_.workspace;
-        window.main && window.main.selectIdDialog && window.main.selectIdDialog(this.getValue(), this._type, (newId) => { newId !== null && this.setValue(newId); });
+    Blockly.Field.prototype.setValue.call(this, id);
+};
+
+/**
+ * Get the text from this field as displayed on screen.  May differ from getText
+ * due to ellipsis, and other formatting.
+ * @return {string} Currently displayed text.
+ * @protected
+ */
+Blockly.FieldOID.prototype.getDisplayText_ = function() {
+    let text = this._idName || this.text_;
+    if (!text) {
+        // Prevent the field from disappearing if empty.
+        return Blockly.Field.NBSP;
+    }
+    if (text.length > this.maxDisplayLength) {
+        // Truncate displayed string and add an ellipsis ('...').
+        text = text.substring(0, this.maxDisplayLength - 2) + '\u2026';
     }
+    // Replace whitespace with non-breaking spaces so the text doesn't collapse.
+    text = text.replace(/\s/g, Blockly.Field.NBSP);
+    if (this.sourceBlock_.RTL) {
+        // The SVG is LTR, force text to be RTL.
+        text += '\u200F';
+    }
+    return text;
+};
 
-    /**
-     * Handle a change to the editor.
-     * @param {!Event} e Keyboard event.
-     * @private
-     */
-    onHtmlInputChange_(e) {
-        var htmlInput = Blockly.FieldOID.htmlInput_;
-        // Update source block.
-        var text = htmlInput.value;
-        if (text !== htmlInput.oldValue_) {
-            htmlInput.oldValue_ = text;
-            this.setValue(text);
-            this.validate_();
-        } else if (goog.userAgent.WEBKIT) {
-            // Cursor key.  Render the source block to show the caret moving.
-            // Chrome only (version 26, OS X).
-            this.sourceBlock_.render();
-        }
+/**
+ * Show the inline free-text editor on top of the text.
+ * @param {boolean=} opt_quietInput True if editor should be created without
+ *     focus.  Defaults to false.
+ * @private
+ */
+Blockly.FieldOID.prototype.showEditor_ = function(opt_quietInput) {
+    this.workspace_ = this.sourceBlock_.workspace;
+    const that = this;
+    window.main && window.main.selectIdDialog && window.main.selectIdDialog(this.getValue(), this._type, function (newId) { newId !== null && that.setValue(newId);});
+};
 
-        this.resizeEditor_();
-        Blockly.svgResize(this.sourceBlock_.workspace);
+/**
+ * Handle key down to the editor.
+ * @param {!Event} e Keyboard event.
+ * @private
+ */
+/*Blockly.FieldOID.prototype.onHtmlInputKeyDown_ = function(e) {
+    const htmlInput = Blockly.FieldOID.htmlInput_;
+    const tabKey = 9, enterKey = 13, escKey = 27;
+    if (e.keyCode == enterKey) {
+        Blockly.WidgetDiv.hide();
+    } else if (e.keyCode == escKey) {
+        htmlInput.value = htmlInput.defaultValue;
+        Blockly.WidgetDiv.hide();
+    } else if (e.keyCode == tabKey) {
+        Blockly.WidgetDiv.hide();
+        this.sourceBlock_.tab(this, !e.shiftKey);
+        e.preventDefault();
     }
+};*/
 
-    /*
-    * Check to see if the contents of the editor validates.
-    * Style the editor accordingly.
-    * @private
-    */
-    validate_() {
-        var valid = true;
-
-        goog.asserts.assertObject(Blockly.FieldOID.htmlInput_);
+/**
+ * Handle a change to the editor.
+ * @param {!Event} e Keyboard event.
+ * @private
+ */
+Blockly.FieldOID.prototype.onHtmlInputChange_ = function(e) {
+    const htmlInput = Blockly.FieldOID.htmlInput_;
+    // Update source block.
+    const text = htmlInput.value;
+    if (text !== htmlInput.oldValue_) {
+        htmlInput.oldValue_ = text;
+        this.setValue(text);
+        this.validate_();
+    } else if (goog.userAgent.WEBKIT) {
+        // Cursor key.  Render the source block to show the caret moving.
+        // Chrome only (version 26, OS X).
+        this.sourceBlock_.render();
+    }
+    this.resizeEditor_();
+    Blockly.svgResize(this.sourceBlock_.workspace);
+};
+/*
+ * Check to see if the contents of the editor validates.
+ * Style the editor accordingly.
+ * @private
+ */
+Blockly.FieldOID.prototype.validate_ = function() {
+    goog.asserts.assertObject(Blockly.FieldOID.htmlInput_);
 
-        var htmlInput = Blockly.FieldOID.htmlInput_;
+    const htmlInput = Blockly.FieldOID.htmlInput_;
 
-        if (htmlInput.value) {
-            Blockly.addClass_(htmlInput, 'blocklyInvalidInput');
-        } else {
-            Blockly.removeClass_(htmlInput, 'blocklyInvalidInput');
-        }
+    if (htmlInput.value) {
+        Blockly.addClass_(htmlInput, 'blocklyInvalidInput');
+    } else {
+        Blockly.removeClass_(htmlInput, 'blocklyInvalidInput');
     }
+};
 
-    /**
-     * Resize the editor and the underlying block to fit the text.
-     * @private
-     */
-    resizeEditor_() {
-        var div = Blockly.WidgetDiv.DIV;
-        var bBox = this.fieldGroup_.getBBox();
-        div.style.width = bBox.width * this.workspace_.scale + 'px';
-        div.style.height = bBox.height * this.workspace_.scale + 'px';
-        var xy = this.getAbsoluteXY_();
-        // In RTL mode block fields and LTR input fields the left edge moves,
-        // whereas the right edge is fixed.  Reposition the editor.
-        if (this.sourceBlock_.RTL) {
-            var borderBBox = this.getScaledBBox_();
-            xy.x += borderBBox.width;
-            xy.x -= div.offsetWidth;
-        }
-        // Shift by a few pixels to line up exactly.
-        xy.y += 1;
-        if (goog.userAgent.GECKO && Blockly.WidgetDiv.DIV.style.top) {
-            // Firefox mis-reports the location of the border by a pixel
-            // once the WidgetDiv is moved into position.
-            xy.x -= 1;
-            xy.y -= 1;
-        }
-        if (goog.userAgent.WEBKIT) {
-            xy.y -= 3;
-        }
-        div.style.left = xy.x + 'px';
-        div.style.top = xy.y + 'px';
+/**
+ * Resize the editor and the underlying block to fit the text.
+ * @private
+ */
+Blockly.FieldOID.prototype.resizeEditor_ = function() {
+    const div = Blockly.WidgetDiv.DIV;
+    const bBox = this.fieldGroup_.getBBox();
+    div.style.width = bBox.width * this.workspace_.scale + 'px';
+    div.style.height = bBox.height * this.workspace_.scale + 'px';
+    const xy = this.getAbsoluteXY_();
+    // In RTL mode block fields and LTR input fields the left edge moves,
+    // whereas the right edge is fixed.  Reposition the editor.
+    if (this.sourceBlock_.RTL) {
+        const borderBBox = this.getScaledBBox_();
+        xy.x += borderBBox.width;
+        xy.x -= div.offsetWidth;
     }
-
-    /**
-     * Close the editor, save the results, and dispose of the editable
-     * text field's elements.
-     * @return {!Function} Closure to call on destruction of the WidgetDiv.
-     * @private
-     */
-    widgetDispose_() {
-        return () => {
-            var htmlInput = this.htmlInput_;
-            // Save the edit (if it validates).
-            var text = htmlInput.value;
-            this.setValue(text);
-            this.sourceBlock_.rendered && this.sourceBlock_.render();
-
-            Blockly.unbindEvent_(htmlInput.onKeyDownWrapper_);
-            Blockly.unbindEvent_(htmlInput.onKeyUpWrapper_);
-            Blockly.unbindEvent_(htmlInput.onKeyPressWrapper_);
-
-            this.workspace_.removeChangeListener(htmlInput.onWorkspaceChangeWrapper_);
-
-            this.htmlInput_ = null;
-
-            // Delete style properties.
-            let style = Blockly.WidgetDiv.DIV.style;
-            style.width = 'auto';
-            style.height = 'auto';
-            style.fontSize = '';
-        };
+    // Shift by a few pixels to line up exactly.
+    xy.y += 1;
+    if (goog.userAgent.GECKO && Blockly.WidgetDiv.DIV.style.top) {
+        // Firefox mis-reports the location of the border by a pixel
+        // once the WidgetDiv is moved into position.
+        xy.x -= 1;
+        xy.y -= 1;
     }
-}
+    if (goog.userAgent.WEBKIT) {
+        xy.y -= 3;
+    }
+    div.style.left = xy.x + 'px';
+    div.style.top = xy.y + 'px';
+};
+
+/**
+ * Close the editor, save the results, and dispose of the editable
+ * text field's elements.
+ * @return {!Function} Closure to call on destruction of the WidgetDiv.
+ * @private
+ */
+Blockly.FieldOID.prototype.widgetDispose_ = function() {
+    const thisField = this;
+    return function() {
+        const htmlInput = Blockly.FieldOID.htmlInput_;
+        // Save the edit (if it validates).
+        const text = htmlInput.value;
+        thisField.setValue(text);
+        thisField.sourceBlock_.rendered && thisField.sourceBlock_.render();
+        Blockly.unbindEvent_(htmlInput.onKeyDownWrapper_);
+        Blockly.unbindEvent_(htmlInput.onKeyUpWrapper_);
+        Blockly.unbindEvent_(htmlInput.onKeyPressWrapper_);
+
+        thisField.workspace_.removeChangeListener(
+            htmlInput.onWorkspaceChangeWrapper_);
 
-Blockly.FieldOID = FieldOID;
+        Blockly.FieldOID.htmlInput_ = null;
 
-// Blockly.fieldRegistry.register('field_oid', FieldOID);
+        // Delete style properties.
+        const style = Blockly.WidgetDiv.DIV.style;
+        style.width = 'auto';
+        style.height = 'auto';
+        style.fontSize = '';
+    };
+};

package/admin/google-blockly/own/field_script.js

@@ -63,7 +63,7 @@ Blockly.b64DecodeUnicode = function(text) {
  * @constructor
  */
 Blockly.FieldScript = function(text) {
-    //Blockly.FieldScript.superClass_.constructor.call(this, text);
+    Blockly.FieldScript.superClass_.constructor.call(this, text);
 };
 if (typeof goog !== 'undefined') {
     goog.inherits(Blockly.FieldScript, Blockly.Field);
@@ -115,15 +115,15 @@ Blockly.FieldScript.prototype.setValue = function (text) {
  */
 Blockly.FieldScript.prototype.showEditor_ = function(opt_quietInput) {
     this.workspace_ = this.sourceBlock_.workspace;
-    var that   = this;
-    var base64 = that.getValue();
-    var args = null;
-    var isReturn = false;
+    const that   = this;
+    const base64 = that.getValue();
+    let args = null;
+    let isReturn = false;
     if (this.sourceBlock_ && this.sourceBlock_.arguments_) {
         args = this.sourceBlock_.arguments_;
     }
     if (this.sourceBlock_.getProcedureDef) {
-        var options = this.sourceBlock_.getProcedureDef();
+        const options = this.sourceBlock_.getProcedureDef();
         isReturn = options[2];
     }
 
@@ -139,10 +139,10 @@ Blockly.FieldScript.prototype.showEditor_ = function(opt_quietInput) {
  */
 Blockly.FieldScript.prototype.render_ = function() {
     // the implementation is taken from field.js => Blockly.Field.prototype.updateSize_
-    var constants = this.getConstants();
-    var xOffset = this.borderRect_ ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
-    var totalWidth = xOffset * 2 + 12;
-    var totalHeight = constants.FIELD_TEXT_HEIGHT;
+    const constants = this.getConstants();
+    const xOffset = this.borderRect_ ? this.getConstants().FIELD_BORDER_RECT_X_PADDING : 0;
+    const totalWidth = xOffset * 2 + 12;
+    let totalHeight = constants.FIELD_TEXT_HEIGHT;
 
     if (this.borderRect_) {
         totalHeight = Math.max(totalHeight, constants.FIELD_BORDER_RECT_HEIGHT);
@@ -161,7 +161,7 @@ Blockly.FieldScript.prototype.render_ = function() {
  * @private
  */
 Blockly.FieldScript.prototype.updateTextNode_ = function() {
-    var width = (Blockly.BlockSvg.SEP_SPACE_X || 5) * 3;
+    const width = (Blockly.BlockSvg.SEP_SPACE_X || 5) * 3;
     if (!this.textElement_) {
         // Not rendered yet.
         return;
@@ -169,7 +169,7 @@ Blockly.FieldScript.prototype.updateTextNode_ = function() {
     // Empty the text element.
     goog.dom.removeChildren(/** @type {!Element} */ (this.textElement_));
 
-    var textNode = document.createTextNode('...');
+    const textNode = document.createTextNode('...');
     this.textElement_.appendChild(textNode);
 
     // Cached width is obsolete.  Clear it.
@@ -183,12 +183,12 @@ Blockly.FieldScript.prototype.updateTextNode_ = function() {
  * @private
  */
 /*Blockly.FieldScript.prototype.widgetDispose_ = function() {
-    var thisField = this;
+    const thisField = this;
     return function() {
-        var htmlInput = Blockly.FieldScript.htmlInput_;
+        const htmlInput = Blockly.FieldScript.htmlInput_;
 
         // Save the edit (if it validates).
-        var text = htmlInput.value;
+        const text = htmlInput.value;
         thisField.setValue(text);
         thisField.sourceBlock_.rendered && thisField.sourceBlock_.render();
         Blockly.unbindEvent_(htmlInput.onKeyDownWrapper_);
@@ -201,7 +201,7 @@ Blockly.FieldScript.prototype.updateTextNode_ = function() {
         Blockly.FieldScript.htmlInput_ = null;
 
         // Delete style properties.
-        var style = Blockly.WidgetDiv.DIV.style;
+        const style = Blockly.WidgetDiv.DIV.style;
         style.width = 'auto';
         style.height = 'auto';
         style.fontSize = '';