From 7d47afb59a204b166feb87254da7e2a89dc39a59 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Mon, 11 Feb 2019 15:37:40 +0800 Subject: [PATCH 01/23] add style --- static/css/_blockly-toolbox.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/css/_blockly-toolbox.scss b/static/css/_blockly-toolbox.scss index a3f8870445..e66fc23c35 100644 --- a/static/css/_blockly-toolbox.scss +++ b/static/css/_blockly-toolbox.scss @@ -95,3 +95,7 @@ .blocklyMainBackground { stroke: none; } + +.blocklyHtmlInput { + background-position: 150% 50% !important; +} \ No newline at end of file From 0f0a61fc438e295d8dc267eb824859e2efe04183 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Mon, 11 Feb 2019 16:34:53 +0800 Subject: [PATCH 02/23] remove pointer events --- static/css/_blockly-toolbox.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/static/css/_blockly-toolbox.scss b/static/css/_blockly-toolbox.scss index e66fc23c35..881acd6098 100644 --- a/static/css/_blockly-toolbox.scss +++ b/static/css/_blockly-toolbox.scss @@ -98,4 +98,5 @@ .blocklyHtmlInput { background-position: 150% 50% !important; + pointer-events: none; } \ No newline at end of file From f2f5b13825f0fc2b7bd7e6df69bc4e8285f1502f Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Mon, 11 Feb 2019 17:26:30 +0800 Subject: [PATCH 03/23] override inline editor blockly --- src/botPage/view/blockly/customBlockly.js | 27 +++++++++++++++++++++++ static/css/_blockly-toolbox.scss | 5 ----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/botPage/view/blockly/customBlockly.js b/src/botPage/view/blockly/customBlockly.js index 966af9270b..11712f5ea2 100644 --- a/src/botPage/view/blockly/customBlockly.js +++ b/src/botPage/view/blockly/customBlockly.js @@ -261,3 +261,30 @@ Blockly.FieldLabel.prototype.init = function() { // Force a render. this.render_(); }; +// Override inline editor blockly +Blockly.FieldTextInput.prototype.showInlineEditor_ = function(quietInput) { + Blockly.WidgetDiv.show(this, this.sourceBlock_.RTL, this.widgetDispose_()); + var div = Blockly.WidgetDiv.DIV; + // Create the input. + var htmlInput = document.createElement('input'); + htmlInput.className = 'blocklyHtmlInput'; + htmlInput.setAttribute('spellcheck', this.spellcheck_); + htmlInput.setAttribute('data-lpignore', 'true'); + var fontSize = Blockly.FieldTextInput.FONTSIZE * this.workspace_.scale + 'pt'; + div.style.fontSize = fontSize; + htmlInput.style.fontSize = fontSize; + + Blockly.FieldTextInput.htmlInput_ = htmlInput; + div.appendChild(htmlInput); + + htmlInput.value = htmlInput.defaultValue = this.text_; + htmlInput.oldValue_ = null; + this.validate_(); + this.resizeEditor_(); + if (!quietInput) { + htmlInput.focus(); + htmlInput.select(); + } + + this.bindEvents_(htmlInput); +}; diff --git a/static/css/_blockly-toolbox.scss b/static/css/_blockly-toolbox.scss index 881acd6098..71952f6df7 100644 --- a/static/css/_blockly-toolbox.scss +++ b/static/css/_blockly-toolbox.scss @@ -94,9 +94,4 @@ .blocklyMainBackground { stroke: none; -} - -.blocklyHtmlInput { - background-position: 150% 50% !important; - pointer-events: none; } \ No newline at end of file From a409b068a268722e4a8fa218c8d0fc454e5e234a Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Mon, 11 Feb 2019 17:27:43 +0800 Subject: [PATCH 04/23] add space --- static/css/_blockly-toolbox.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/css/_blockly-toolbox.scss b/static/css/_blockly-toolbox.scss index 71952f6df7..a3f8870445 100644 --- a/static/css/_blockly-toolbox.scss +++ b/static/css/_blockly-toolbox.scss @@ -94,4 +94,4 @@ .blocklyMainBackground { stroke: none; -} \ No newline at end of file +} From d6912169d57918256a01b50693a3c1da96621077 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 12 Feb 2019 10:38:51 +0800 Subject: [PATCH 05/23] check input barrier offset --- package-lock.json | 43 +++++++++++++------ .../view/blockly/blocks/trade/components.js | 4 +- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 159c491185..0c4927a503 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5268,7 +5268,8 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -5292,13 +5293,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5315,19 +5318,22 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5458,7 +5464,8 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5472,6 +5479,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5488,6 +5496,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5496,13 +5505,15 @@ "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5523,6 +5534,7 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5611,7 +5623,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5625,6 +5638,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5720,7 +5734,8 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5762,6 +5777,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5783,6 +5799,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5831,13 +5848,15 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true + "dev": true, + "optional": true } } }, @@ -8605,7 +8624,7 @@ "dev": true, "requires": { "acorn": "^4.0.11", - "clone": "github:aminmarashi/clone#d97b4f0ff3d3afebcaaf4a2ecc9c50fbce914900" + "clone": "github:aminmarashi/clone#d97b4f" }, "dependencies": { "acorn": { diff --git a/src/botPage/view/blockly/blocks/trade/components.js b/src/botPage/view/blockly/blocks/trade/components.js index 8252e32ac1..b7bad0b82d 100644 --- a/src/botPage/view/blockly/blocks/trade/components.js +++ b/src/botPage/view/blockly/blocks/trade/components.js @@ -78,7 +78,7 @@ export const barrierOffset = block => { .appendField(new Blockly.FieldDropdown(config.barrierTypes), 'BARRIEROFFSETTYPE_LIST'); } else { const barrierOffsetList = block.getField('BARRIEROFFSETTYPE_LIST'); - if (!block.workspace.getBlockById('BARRIERVALUE')) { + if (!block.workspace.getBlockById('BARRIERVALUE') && !block.getInput('BARRIEROFFSET').connection) { const barrierValue = block.workspace.newBlock('math_number', 'BARRIERVALUE'); barrierOffsetList.setValue('+'); barrierValue.setFieldValue('0.274', 'NUM'); @@ -99,7 +99,7 @@ export const secondBarrierOffset = block => { .appendField(new Blockly.FieldDropdown(config.barrierTypes), 'SECONDBARRIEROFFSETTYPE_LIST'); } else { const barrierOffsetList = block.getField('SECONDBARRIEROFFSETTYPE_LIST'); - if (!block.workspace.getBlockById('SECONDBARRIERVALUE')) { + if (!block.workspace.getBlockById('SECONDBARRIERVALUE') && !block.getInput('SECONDBARRIEROFFSET').connection) { const secondBarrierValue = block.workspace.newBlock('math_number', 'SECONDBARRIERVALUE'); barrierOffsetList.setValue('-'); secondBarrierValue.setFieldValue('0.274', 'NUM'); From 1cd968454003c800680239edaf9d4309189d1c3d Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 12 Feb 2019 10:50:45 +0800 Subject: [PATCH 06/23] add validation to check connection for barrieroffset --- src/botPage/view/blockly/blocks/trade/components.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/botPage/view/blockly/blocks/trade/components.js b/src/botPage/view/blockly/blocks/trade/components.js index b7bad0b82d..39059f8471 100644 --- a/src/botPage/view/blockly/blocks/trade/components.js +++ b/src/botPage/view/blockly/blocks/trade/components.js @@ -78,7 +78,11 @@ export const barrierOffset = block => { .appendField(new Blockly.FieldDropdown(config.barrierTypes), 'BARRIEROFFSETTYPE_LIST'); } else { const barrierOffsetList = block.getField('BARRIEROFFSETTYPE_LIST'); - if (!block.workspace.getBlockById('BARRIERVALUE') && !block.getInput('BARRIEROFFSET').connection) { + + if ( + !block.workspace.getBlockById('BARRIERVALUE') && + !block.getInput('BARRIEROFFSET').connection.isConnected() + ) { const barrierValue = block.workspace.newBlock('math_number', 'BARRIERVALUE'); barrierOffsetList.setValue('+'); barrierValue.setFieldValue('0.274', 'NUM'); @@ -99,7 +103,11 @@ export const secondBarrierOffset = block => { .appendField(new Blockly.FieldDropdown(config.barrierTypes), 'SECONDBARRIEROFFSETTYPE_LIST'); } else { const barrierOffsetList = block.getField('SECONDBARRIEROFFSETTYPE_LIST'); - if (!block.workspace.getBlockById('SECONDBARRIERVALUE') && !block.getInput('SECONDBARRIEROFFSET').connection) { + + if ( + !block.workspace.getBlockById('SECONDBARRIERVALUE') && + !block.getInput('BARRIEROFFSET').connection.isConnected() + ) { const secondBarrierValue = block.workspace.newBlock('math_number', 'SECONDBARRIERVALUE'); barrierOffsetList.setValue('-'); secondBarrierValue.setFieldValue('0.274', 'NUM'); From 9d4873c1a2ee7479b5fe7ea37e6aa35bb81d517b Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 12 Feb 2019 10:52:57 +0800 Subject: [PATCH 07/23] fix package lock --- package-lock.json | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0c4927a503..159c491185 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5268,8 +5268,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -5293,15 +5292,13 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5318,22 +5315,19 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -5464,8 +5458,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -5479,7 +5472,6 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5496,7 +5488,6 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5505,15 +5496,13 @@ "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5534,7 +5523,6 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5623,8 +5611,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5638,7 +5625,6 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5734,8 +5720,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -5777,7 +5762,6 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5799,7 +5783,6 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5848,15 +5831,13 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true, - "optional": true + "dev": true } } }, @@ -8624,7 +8605,7 @@ "dev": true, "requires": { "acorn": "^4.0.11", - "clone": "github:aminmarashi/clone#d97b4f" + "clone": "github:aminmarashi/clone#d97b4f0ff3d3afebcaaf4a2ecc9c50fbce914900" }, "dependencies": { "acorn": { From e74585fa2faed7051289a1a4f230a4817cec430c Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 12 Feb 2019 11:04:51 +0800 Subject: [PATCH 08/23] check connection before adding barrier value --- src/botPage/view/blockly/blocks/trade/components.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/botPage/view/blockly/blocks/trade/components.js b/src/botPage/view/blockly/blocks/trade/components.js index 39059f8471..7c5013e98c 100644 --- a/src/botPage/view/blockly/blocks/trade/components.js +++ b/src/botPage/view/blockly/blocks/trade/components.js @@ -106,7 +106,7 @@ export const secondBarrierOffset = block => { if ( !block.workspace.getBlockById('SECONDBARRIERVALUE') && - !block.getInput('BARRIEROFFSET').connection.isConnected() + !block.getInput('SECONDBARRIEROFFSET').connection.isConnected() ) { const secondBarrierValue = block.workspace.newBlock('math_number', 'SECONDBARRIERVALUE'); barrierOffsetList.setValue('-'); From 913fe9e6b07841e65453502fc6b409311df05e4d Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 12 Feb 2019 14:50:19 +0800 Subject: [PATCH 09/23] set field value --- src/botPage/view/blockly/blocks/trade/components.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/botPage/view/blockly/blocks/trade/components.js b/src/botPage/view/blockly/blocks/trade/components.js index 7c5013e98c..ad5a139c21 100644 --- a/src/botPage/view/blockly/blocks/trade/components.js +++ b/src/botPage/view/blockly/blocks/trade/components.js @@ -85,7 +85,7 @@ export const barrierOffset = block => { ) { const barrierValue = block.workspace.newBlock('math_number', 'BARRIERVALUE'); barrierOffsetList.setValue('+'); - barrierValue.setFieldValue('0.274', 'NUM'); + barrierValue.setFieldValue('0.27', 'NUM'); barrierValue.setShadow(true); barrierValue.outputConnection.connect(block.getInput('BARRIEROFFSET').connection); barrierValue.initSvg(); @@ -110,7 +110,7 @@ export const secondBarrierOffset = block => { ) { const secondBarrierValue = block.workspace.newBlock('math_number', 'SECONDBARRIERVALUE'); barrierOffsetList.setValue('-'); - secondBarrierValue.setFieldValue('0.274', 'NUM'); + secondBarrierValue.setFieldValue('0.27', 'NUM'); secondBarrierValue.setShadow(true); secondBarrierValue.outputConnection.connect(block.getInput('SECONDBARRIEROFFSET').connection); secondBarrierValue.initSvg(); From 6ddd2ce4d32518f9743da2afc35293f9d6d76ea6 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 12 Feb 2019 19:08:01 +0800 Subject: [PATCH 10/23] update package lock --- package-lock.json | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 159c491185..0c4927a503 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5268,7 +5268,8 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -5292,13 +5293,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5315,19 +5318,22 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5458,7 +5464,8 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5472,6 +5479,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5488,6 +5496,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5496,13 +5505,15 @@ "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5523,6 +5534,7 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5611,7 +5623,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5625,6 +5638,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5720,7 +5734,8 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5762,6 +5777,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5783,6 +5799,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5831,13 +5848,15 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true + "dev": true, + "optional": true } } }, @@ -8605,7 +8624,7 @@ "dev": true, "requires": { "acorn": "^4.0.11", - "clone": "github:aminmarashi/clone#d97b4f0ff3d3afebcaaf4a2ecc9c50fbce914900" + "clone": "github:aminmarashi/clone#d97b4f" }, "dependencies": { "acorn": { From 82f66e05b3986a0d8519548adf2d3b5654c28bd9 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 19 Feb 2019 17:23:00 +0800 Subject: [PATCH 11/23] add trackjs error --- src/botPage/view/blockly/utils.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/botPage/view/blockly/utils.js b/src/botPage/view/blockly/utils.js index cf8879e3f8..032219e2e3 100644 --- a/src/botPage/view/blockly/utils.js +++ b/src/botPage/view/blockly/utils.js @@ -97,7 +97,14 @@ export const strategyHasValidTradeTypeCategory = xml => { return false; }); if (!validTradeTypeCategory) { - globalObserver.emit('ui.log.error', translate('The strategy you tried to import is invalid.')); + const errorMessage = translate('The strategy you tried to import is invalid.'); + globalObserver.emit('ui.log.error', errorMessage); + + if (trackJs) { + const errorWithCode = new Error(errorMessage); + + trackJs.track(errorWithCode); + } } return validTradeTypeCategory; }; From 8c6424342f4baa534cd204f930668842ce5367d6 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 19 Feb 2019 17:32:07 +0800 Subject: [PATCH 12/23] condition of trackJs --- src/botPage/view/blockly/utils.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/botPage/view/blockly/utils.js b/src/botPage/view/blockly/utils.js index 032219e2e3..fe6134f221 100644 --- a/src/botPage/view/blockly/utils.js +++ b/src/botPage/view/blockly/utils.js @@ -98,13 +98,9 @@ export const strategyHasValidTradeTypeCategory = xml => { }); if (!validTradeTypeCategory) { const errorMessage = translate('The strategy you tried to import is invalid.'); - globalObserver.emit('ui.log.error', errorMessage); - - if (trackJs) { - const errorWithCode = new Error(errorMessage); - trackJs.track(errorWithCode); - } + globalObserver.emit('ui.log.error', errorMessage); + window.trackJs && trackJs.console.error(errorMessage); // eslint-disable-line no-unused-expressions } return validTradeTypeCategory; }; From fb35badd0b9f47570be55fc3c0e3f380c095ee57 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 19 Feb 2019 17:33:54 +0800 Subject: [PATCH 13/23] change from console to track --- src/botPage/view/blockly/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/botPage/view/blockly/utils.js b/src/botPage/view/blockly/utils.js index fe6134f221..a748581488 100644 --- a/src/botPage/view/blockly/utils.js +++ b/src/botPage/view/blockly/utils.js @@ -100,7 +100,7 @@ export const strategyHasValidTradeTypeCategory = xml => { const errorMessage = translate('The strategy you tried to import is invalid.'); globalObserver.emit('ui.log.error', errorMessage); - window.trackJs && trackJs.console.error(errorMessage); // eslint-disable-line no-unused-expressions + window.trackJs && trackJs.track(errorMessage); // eslint-disable-line no-unused-expressions } return validTradeTypeCategory; }; From 02b8a2ad47cda2c8e9abd8da9cd908cef01416a9 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 19 Feb 2019 18:11:49 +0800 Subject: [PATCH 14/23] invalid financial market condition --- src/botPage/view/blockly/index.js | 3 +++ src/botPage/view/blockly/utils.js | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/botPage/view/blockly/index.js b/src/botPage/view/blockly/index.js index 47ec73cead..1ea3de507a 100644 --- a/src/botPage/view/blockly/index.js +++ b/src/botPage/view/blockly/index.js @@ -72,6 +72,9 @@ const marketsWereRemoved = xml => { }, ], }); + if (window.trackJs) { + trackJs.track('Invalid financial market'); + } $('#unavailableMarkets').dialog('open'); return true; } diff --git a/src/botPage/view/blockly/utils.js b/src/botPage/view/blockly/utils.js index a748581488..ece0b55396 100644 --- a/src/botPage/view/blockly/utils.js +++ b/src/botPage/view/blockly/utils.js @@ -98,9 +98,11 @@ export const strategyHasValidTradeTypeCategory = xml => { }); if (!validTradeTypeCategory) { const errorMessage = translate('The strategy you tried to import is invalid.'); - globalObserver.emit('ui.log.error', errorMessage); - window.trackJs && trackJs.track(errorMessage); // eslint-disable-line no-unused-expressions + + if (window.trackJs) { + trackJs.track(errorMessage); + } } return validTradeTypeCategory; }; From ea187596a2544e10d8377d2b848b6269fd0e389b Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Fri, 22 Feb 2019 09:49:22 +0800 Subject: [PATCH 15/23] Remove Amplitude --- .eslintrc | 1 - src/botPage/view/logger.js | 21 --------------------- templates/partials/head.mustache | 15 --------------- 3 files changed, 37 deletions(-) diff --git a/.eslintrc b/.eslintrc index b4346a8137..582942b284 100644 --- a/.eslintrc +++ b/.eslintrc @@ -19,7 +19,6 @@ "globals": { "Blockly": false, "trackJs": false, - "amplitude": false, "jest": false }, "plugins": [ diff --git a/src/botPage/view/logger.js b/src/botPage/view/logger.js index 5111d8d7f3..d9e5ff4a94 100644 --- a/src/botPage/view/logger.js +++ b/src/botPage/view/logger.js @@ -91,8 +91,6 @@ const waitForNotifications = () => { 'log.trade.finish', ]; - const amplitudeList = ['log.bot.login', 'log.trade.finish']; - logList.forEach(event => globalObserver.register(event, d => log('info', event, d))); globalObserver.register('Notify', notify); @@ -102,21 +100,6 @@ const waitForNotifications = () => { notifList.forEach(className => globalObserver.register(`ui.log.${className}`, message => notify({ className, message, position: 'right' })) ); - - amplitudeList.forEach(event => globalObserver.register(event, d => amplitude.getInstance().logEvent(event, d))); - - globalObserver.register('log.revenue', data => { - const { user, profit, contract } = data; - - if (typeof amplitude !== 'undefined' && !isVirtual(user)) { - const revenue = new amplitude.Revenue() - .setProductId(`${contract.underlying}.${contract.contract_type}`) - .setPrice(-profit) - .setRevenueType(profit < 0 ? 'loss' : 'win'); - - amplitude.getInstance().logRevenueV2(revenue, { contract }); - } - }); }; const logHandler = () => { @@ -125,10 +108,6 @@ const logHandler = () => { .attr('value'); const userId = getToken(token).accountName; - if (amplitude) { - amplitude.getInstance().setUserId(userId); - } - if (trackJs) { trackJs.configure({ userId }); } diff --git a/templates/partials/head.mustache b/templates/partials/head.mustache index df427306b1..b5883f6952 100644 --- a/templates/partials/head.mustache +++ b/templates/partials/head.mustache @@ -24,19 +24,4 @@ ga('create', 'UA-40877026-12', 'auto'); ga('send', 'pageview'); - // amplitude - (function(e,t){var n=e.amplitude||{_q:[],_iq:{}};var r=t.createElement("script");r.type="text/javascript"; - r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-3.0.1-min.gz.js"; - r.onload=function(){e.amplitude.runQueuedFunctions()};var i=t.getElementsByTagName("script")[0]; - i.parentNode.insertBefore(r,i);function s(e,t){e.prototype[t]=function(){this._q.push([t].concat(Array.prototype.slice.call(arguments,0))); - return this}}var o=function(){this._q=[];return this};var a=["add","append","clearAll","prepend","set","setOnce","unset"]; - for(var u=0;u From 7a03d40ee203b0d428f56a6cd3923fe2f7048ba2 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Fri, 22 Feb 2019 10:48:41 +0800 Subject: [PATCH 16/23] Remove unused import --- src/botPage/view/logger.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/botPage/view/logger.js b/src/botPage/view/logger.js index d9e5ff4a94..2f419bf3f2 100644 --- a/src/botPage/view/logger.js +++ b/src/botPage/view/logger.js @@ -1,7 +1,6 @@ import { observer as globalObserver } from '../../common/utils/observer'; import { getToken } from '../../common/utils/storageManager'; import { translate } from '../../common/i18n'; -import { isVirtual } from '../common/tools'; const log = (type, ...args) => { if (type === 'warn') { From 72f7c242289063cc807fec4f4d965a0173a0e973 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Fri, 22 Feb 2019 16:33:29 +0800 Subject: [PATCH 17/23] Set z-index so notifications show on top of everything --- static/css/_footer.scss | 2 +- static/css/bot.scss | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/static/css/_footer.scss b/static/css/_footer.scss index 788f3d4332..951e38abfb 100644 --- a/static/css/_footer.scss +++ b/static/css/_footer.scss @@ -135,7 +135,7 @@ font-size: $FONT_SIZE_XS; position: fixed; bottom: 0; - z-index: 10000; + z-index: 100 !important; width: 100%; } #status_notification { diff --git a/static/css/bot.scss b/static/css/bot.scss index b50babb388..b565a92e0a 100644 --- a/static/css/bot.scss +++ b/static/css/bot.scss @@ -208,4 +208,12 @@ label { .ui-icon { background-image: none !important; +} + +#_elev_io ._1g6cj { + z-index: 10000 !important; +} + +.notifyjs-corner { + z-index: 10001 !important; } \ No newline at end of file From 3830a0b4d56e853a76cbc6a793168f8363434c01 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Fri, 22 Feb 2019 17:46:52 +0800 Subject: [PATCH 18/23] Create notifyjs-containers so they're not generated in blocklyMinimalBody's body --- templates/bot.mustache | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/bot.mustache b/templates/bot.mustache index 1e5cf21f9e..35cf95867a 100644 --- a/templates/bot.mustache +++ b/templates/bot.mustache @@ -190,6 +190,8 @@ {{> bundle}} {{> bot}} {{> elevio_script }} +
+
\ No newline at end of file From 1beca38986044c74426addf80d2669e9cb4d3c07 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Fri, 22 Feb 2019 18:19:44 +0800 Subject: [PATCH 19/23] Stop sending undefined version to TrackJS --- src/botPage/view/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/botPage/view/index.js b/src/botPage/view/index.js index 4a64f7c549..2dbf151553 100644 --- a/src/botPage/view/index.js +++ b/src/botPage/view/index.js @@ -5,7 +5,6 @@ import 'notifyjs-browser'; import '../../common/binary-ui/dropdown'; import Elevio from '../../common/elevio'; import View from './View'; -import { version } from '../../../package.json'; $.ajaxSetup({ cache: false, @@ -31,7 +30,6 @@ view.initPromise.then(() => { $('.barspinner').hide(); window.dispatchEvent(new Event('resize')); Elevio.init(); - trackJs.addMetadata('version', version); trackJs.configure({ userId: $('.account-id') .first() From c3c87e2d3812ed495fecdcf6a0cb093383cacb8c Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Fri, 22 Feb 2019 18:20:06 +0800 Subject: [PATCH 20/23] Remove undefined version from CLI --- src/botPage/bot/cli.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/botPage/bot/cli.js b/src/botPage/bot/cli.js index 7ddfeffe4c..3e6f77b456 100644 --- a/src/botPage/bot/cli.js +++ b/src/botPage/bot/cli.js @@ -3,7 +3,6 @@ import fs from 'fs'; import readline from 'readline'; import program from 'commander'; import { observer as globalObserver } from '../../common/utils/observer'; -import { version } from '../../../package.json'; import { createInterpreter } from './CliTools'; const log = (...args) => console.log(`${new Date().toLocaleTimeString()}:`, ...args); // eslint-disable-line no-console @@ -15,7 +14,6 @@ setInterval(() => {}, 2147483647); // Keep node alive let filename; program - .version(version) .usage('[filename]') .arguments('[filename]') .action(fn => { From 6eae02de259eeba1077abd67d571e32040811dcc Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Mon, 25 Feb 2019 14:51:57 +0800 Subject: [PATCH 21/23] Give URL language priority over user's language, fallback to 'en' --- src/common/elevio.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/common/elevio.js b/src/common/elevio.js index 726eaeb596..122e6119b1 100644 --- a/src/common/elevio.js +++ b/src/common/elevio.js @@ -2,19 +2,22 @@ import { generateLiveApiInstance } from './appId'; // import { getLanguage } from '../common/lang'; import { getTokenList } from './utils/storageManager'; import { translate } from '../common/i18n'; +import { getLanguage } from './lang'; const Elevio = (() => { const init = () => { if (!window._elev) return; // eslint-disable-line no-underscore-dangle // eslint-disable-next-line no-underscore-dangle window._elev.on('load', elev => { - // const availableElevLanguages = ['es', 'id', 'pt', 'ru']; - // const currentLanguage = getLanguage().toLowerCase(); - // if (availableElevLanguages.indexOf(currentLanguage) !== -1) { - // window._elev.setLanguage(currentLanguage); // eslint-disable-line no-underscore-dangle - // } - // eslint-disable-next-line no-underscore-dangle - window._elev.setSettings({ + const availableLanguages = ['en']; // Enable when available: ['es', 'id', 'pt', 'ru'] + const currentLanguage = getLanguage(); + if (availableLanguages.includes(currentLanguage)) { + elev.setLanguage(currentLanguage); + } else { + elev.setLanguage('en'); + } + + elev.setSettings({ page_url: `${document.location.protocol}//${document.location.hostname}${document.location.pathname}`, }); setUserInfo(elev); From 38bbe2c9a28060887c1c95b9f5b7029df32d34f7 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Mon, 25 Feb 2019 15:00:04 +0800 Subject: [PATCH 22/23] Override default homepage for Elev.io --- src/common/elevio.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/elevio.js b/src/common/elevio.js index 122e6119b1..6c96a94229 100644 --- a/src/common/elevio.js +++ b/src/common/elevio.js @@ -7,6 +7,10 @@ import { getLanguage } from './lang'; const Elevio = (() => { const init = () => { if (!window._elev) return; // eslint-disable-line no-underscore-dangle + + // eslint-disable-next-line no-underscore-dangle + window._elev.on('widget:opened', () => window._elev.openArticle('43')); + // eslint-disable-next-line no-underscore-dangle window._elev.on('load', elev => { const availableLanguages = ['en']; // Enable when available: ['es', 'id', 'pt', 'ru'] From 179758129c7f0cc2d4bde70e51ef72b63b246a13 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Mon, 25 Feb 2019 17:52:05 +0800 Subject: [PATCH 23/23] Enable all languages --- src/common/elevio.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/elevio.js b/src/common/elevio.js index 6c96a94229..5e5c8e2db2 100644 --- a/src/common/elevio.js +++ b/src/common/elevio.js @@ -13,7 +13,7 @@ const Elevio = (() => { // eslint-disable-next-line no-underscore-dangle window._elev.on('load', elev => { - const availableLanguages = ['en']; // Enable when available: ['es', 'id', 'pt', 'ru'] + const availableLanguages = ['en', 'es', 'id', 'pt', 'ru']; const currentLanguage = getLanguage(); if (availableLanguages.includes(currentLanguage)) { elev.setLanguage(currentLanguage);