more blocks

binary-com · Jul 17, 2019 · b457e0d · b457e0d
1 parent d146606
commit b457e0d
Show file tree

Hide file tree

Showing 102 changed files with 398 additions and 142 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/scratch/blocks/Advanced/Functions/procedures_callnoreturn.js b/src/scratch/blocks/Advanced/Functions/procedures_callnoreturn.js
@@ -35,7 +35,7 @@ Blockly.Blocks.procedures_callnoreturn = {
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('Function with no return value tooltip'),
-            category         : 'functions',
+            category         : Blockly.Categories.Functions,
         };
     },
     /**

diff --git a/src/scratch/blocks/Advanced/Functions/procedures_callreturn.js b/src/scratch/blocks/Advanced/Functions/procedures_callreturn.js
@@ -26,7 +26,7 @@ Blockly.Blocks.procedures_callreturn = {
             colourSecondary: Blockly.Colours.BinaryProcedures.colourSecondary,
             colourTertiary : Blockly.Colours.BinaryProcedures.colourTertiary,
             tooltip        : translate('Function with return value'),
-            category       : translate('functions'),
+            category       : Blockly.Categories.Functions,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/Functions/procedures_defnoreturn.js b/src/scratch/blocks/Advanced/Functions/procedures_defnoreturn.js
@@ -38,7 +38,7 @@ Blockly.Blocks.procedures_defnoreturn = {
             colourSecondary: Blockly.Colours.BinaryProcedures.colourSecondary,
             colourTertiary : Blockly.Colours.BinaryProcedures.colourTertiary,
             tooltip        : translate('function with no return tooltip'),
-            category       : translate('functions'),
+            category       : Blockly.Categories.Functions,
         };
     },
     meta() {

diff --git a/src/scratch/blocks/Advanced/Functions/procedures_defreturn.js b/src/scratch/blocks/Advanced/Functions/procedures_defreturn.js
@@ -50,7 +50,7 @@ Blockly.Blocks.procedures_defreturn = {
             colourSecondary: Blockly.Colours.BinaryProcedures.colourSecondary,
             colourTertiary : Blockly.Colours.BinaryProcedures.colourTertiary,
             tooltip        : translate('Function def with return value'),
-            category       : translate('functions'),
+            category       : Blockly.Categories.Functions,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/Functions/procedures_ifreturn.js b/src/scratch/blocks/Advanced/Functions/procedures_ifreturn.js
@@ -30,7 +30,7 @@ Blockly.Blocks.procedures_ifreturn = {
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('Function If Else'),
-            category         : 'functions',
+            category         : Blockly.Categories.Functions,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/List/lists_create_with.js b/src/scratch/blocks/Advanced/List/lists_create_with.js
@@ -33,7 +33,7 @@ Blockly.Blocks.lists_create_with = {
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('Create List with'),
-            category         : 'list',
+            category         : Blockly.Categories.List,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/List/lists_indexOf.js b/src/scratch/blocks/Advanced/List/lists_indexOf.js
@@ -28,7 +28,7 @@ Blockly.Blocks.lists_indexOf = {
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('Index of List Tooltip'),
-            category       : 'list',
+            category       : Blockly.Categories.List,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/List/lists_isEmpty.js b/src/scratch/blocks/Advanced/List/lists_isEmpty.js
@@ -20,7 +20,7 @@ Blockly.Blocks.lists_isEmpty = {
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('List is Empty Tooltip'),
-            category       : 'list',
+            category       : Blockly.Categories.List,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/List/lists_length.js b/src/scratch/blocks/Advanced/List/lists_length.js
@@ -19,7 +19,7 @@ Blockly.Blocks.lists_length = {
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('List Length Tooltip'),
-            category       : 'list',
+            category       : Blockly.Categories.List,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/List/lists_repeat.js b/src/scratch/blocks/Advanced/List/lists_repeat.js
@@ -28,7 +28,7 @@ Blockly.Blocks.lists_repeat = {
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('List Repeat Tooltip'),
-            category         : 'list',
+            category         : Blockly.Categories.List,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/List/lists_sort.js b/src/scratch/blocks/Advanced/List/lists_sort.js
@@ -29,7 +29,7 @@ Blockly.Blocks.lists_sort = {
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('List Sort Tooltip'),
-            category       : 'list',
+            category       : Blockly.Categories.List,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/List/lists_statement.js b/src/scratch/blocks/Advanced/List/lists_statement.js
@@ -26,7 +26,7 @@ Blockly.Blocks.lists_statement = {
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('List Statement Tooltip'),
-            category         : 'list',
+            category         : Blockly.Categories.List,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/Loops/controls_flow_statements.js b/src/scratch/blocks/Advanced/Loops/controls_flow_statements.js
@@ -23,7 +23,7 @@ Blockly.Blocks.controls_flow_statements = {
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('Control Statement Tooltip'),
-            category         : 'loop',
+            category         : Blockly.Categories.Loop,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/Loops/controls_for.js b/src/scratch/blocks/Advanced/Loops/controls_for.js
@@ -42,7 +42,7 @@ Blockly.Blocks.controls_for = {
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('Control For Tooltip'),
-            category         : 'loop',
+            category         : Blockly.Categories.Loop,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/Loops/controls_forEach.js b/src/scratch/blocks/Advanced/Loops/controls_forEach.js
@@ -32,7 +32,7 @@ Blockly.Blocks.controls_forEach = {
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('Control Foreach Tooltip'),
-            category         : 'loop',
+            category         : Blockly.Categories.Loop,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/Loops/controls_repeat.js b/src/scratch/blocks/Advanced/Loops/controls_repeat.js
@@ -30,7 +30,7 @@ Blockly.Blocks.controls_repeat = {
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('Control Repeat Tooltip'),
-            category         : 'loop',
+            category         : Blockly.Categories.Loop,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/Loops/controls_repeat_ext.js b/src/scratch/blocks/Advanced/Loops/controls_repeat_ext.js
@@ -27,7 +27,7 @@ Blockly.Blocks.controls_repeat_ext = {
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('Control Repeat Tooltip'),
-            category         : 'loop',
+            category         : Blockly.Categories.Loop,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/Loops/controls_whileUntil.js b/src/scratch/blocks/Advanced/Loops/controls_whileUntil.js
@@ -32,7 +32,7 @@ Blockly.Blocks.controls_whileUntil = {
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('Control While Tooltip'),
-            category         : 'loop',
+            category         : Blockly.Categories.Loop,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/Variable/variables_get.js b/src/scratch/blocks/Advanced/Variable/variables_get.js
@@ -21,7 +21,7 @@ Blockly.Blocks.variables_get = {
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('Get Variable Tooltip'),
-            category       : translate('variables'),
+            category       : Blockly.Categories.Variables,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Advanced/Variable/variables_set.js b/src/scratch/blocks/Advanced/Variable/variables_set.js
@@ -25,7 +25,7 @@ Blockly.Blocks.variables_set = {
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('Set Variable Tooltip'),
-            category         : 'variables',
+            category         : Blockly.Categories.Variables,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Binary/After Purchase/after_purchase.js b/src/scratch/blocks/Binary/After Purchase/after_purchase.js
@@ -35,7 +35,7 @@ Blockly.Blocks.after_purchase = {
             tooltip        : translate(
                 'Get the previous trade information and result, then trade again (Runs on trade finish)'
             ),
-            category: 'after-purchase',
+            category: Blockly.Categories.After_Purchase,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Binary/After Purchase/check_result.js b/src/scratch/blocks/Binary/After Purchase/check_result.js
@@ -21,7 +21,7 @@ Blockly.Blocks.contract_check_result = {
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('True if the result matches the selection'),
-            category       : translate('after-purchase'),
+            category       : Blockly.Categories.After_Purchase,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Binary/After Purchase/read_details.js b/src/scratch/blocks/Binary/After Purchase/read_details.js
@@ -20,7 +20,7 @@ Blockly.Blocks.read_details = {
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('Reads a selected option from contract details list'),
-            category       : translate('after-purchase'),
+            category       : Blockly.Categories.After_Purchase,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Binary/After Purchase/trade_again.js b/src/scratch/blocks/Binary/After Purchase/trade_again.js
@@ -15,7 +15,7 @@ Blockly.Blocks.trade_again = {
             colourTertiary   : Blockly.Colours.Binary.colourTertiary,
             previousStatement: null,
             tooltip          : translate('Runs the trade block again'),
-            category         : 'after-purchase',
+            category         : Blockly.Categories.After_Purchase,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Binary/Before Purchase/ask_price.js b/src/scratch/blocks/Binary/Before Purchase/ask_price.js
@@ -21,7 +21,7 @@ Blockly.Blocks.ask_price = {
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('Ask Price for selected proposal'),
-            category       : translate('before-purchase'),
+            category       : Blockly.Categories.Before_Purchase,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Binary/Before Purchase/before_purchase.js b/src/scratch/blocks/Binary/Before Purchase/before_purchase.js
@@ -33,7 +33,7 @@ Blockly.Blocks.before_purchase = {
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('Watch the tick stream and purchase the desired contract (Runs on tick update)'),
-            category       : translate('before-purchase'),
+            category       : Blockly.Categories.Before_Purchase,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Binary/Before Purchase/payout.js b/src/scratch/blocks/Binary/Before Purchase/payout.js
@@ -21,7 +21,7 @@ Blockly.Blocks.payout = {
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('Payout for selected proposal'),
-            category       : translate('before-purchase'),
+            category       : Blockly.Categories.Before_Purchase,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Binary/Before Purchase/purchase.js b/src/scratch/blocks/Binary/Before Purchase/purchase.js
@@ -23,7 +23,7 @@ Blockly.Blocks.purchase = {
             colourSecondary  : Blockly.Colours.Binary.colourSecondary,
             colourTertiary   : Blockly.Colours.Binary.colourTertiary,
             tooltip          : translate('Payout for selected proposal'),
-            category         : 'before-purchase',
+            category         : Blockly.Categories.Before_Purchase,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Binary/During Purchase/check_sell.js b/src/scratch/blocks/Binary/During Purchase/check_sell.js
@@ -2,15 +2,25 @@ import { translate } from '../../../../utils/lang/i18n';
 
 Blockly.Blocks.check_sell = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             message0       : translate('Sell is available'),
             output         : 'Boolean',
             outputShape    : Blockly.OUTPUT_SHAPE_HEXAGONAL,
             colour         : Blockly.Colours.Binary.colour,
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('True if sell at market is available'),
-        });
+            category       : Blockly.Categories.During_Purchase,
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Check Sell'),
+            'description' : translate('Check Sell Description'),
+        };
     },
     onchange(event) {
         if (!this.workspace || this.isInFlyout || this.workspace.isDragging()) {

diff --git a/src/scratch/blocks/Binary/During Purchase/during_purchase.js b/src/scratch/blocks/Binary/During Purchase/during_purchase.js
@@ -35,7 +35,7 @@ Blockly.Blocks.during_purchase = {
             tooltip        : translate(
                 'Watch the purchased contract info and sell at market if available (Runs on contract update)'
             ),
-            category: 'during-purchase',
+            category: Blockly.Categories.During_Purchase,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Binary/During Purchase/sell_at_market.js b/src/scratch/blocks/Binary/During Purchase/sell_at_market.js
@@ -2,15 +2,25 @@ import { translate }         from '../../../../utils/lang/i18n';
 
 Blockly.Blocks.sell_at_market = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             message0         : translate('Sell at market'),
             colour           : Blockly.Colours.Binary.colour,
             colourSecondary  : Blockly.Colours.Binary.colourSecondary,
             colourTertiary   : Blockly.Colours.Binary.colourTertiary,
             previousStatement: null,
             nextStatement    : null,
             tooltip          : translate('Sell at market'),
-        });
+            category         : Blockly.Categories.During_Purchase,
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Sell at market'),
+            'description' : translate('Sell at market description'),
+        };
     },
     onchange(event) {
         if (!this.workspace || this.isInFlyout || this.workspace.isDragging()) {

diff --git a/src/scratch/blocks/Binary/During Purchase/sell_price.js b/src/scratch/blocks/Binary/During Purchase/sell_price.js
@@ -2,15 +2,25 @@ import { translate }         from '../../../../utils/lang/i18n';
 
 Blockly.Blocks.sell_price = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             message0       : translate('Sell profit/loss'),
             output         : 'Number',
             outputShape    : Blockly.OUTPUT_SHAPE_ROUND,
             colour         : Blockly.Colours.Binary.colour,
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('Returns the profit for sell at market.'),
-        });
+            category       : Blockly.Categories.During_Purchase,
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Sell price'),
+            'description' : translate('Sell price description'),
+        };
     },
     onchange(event) {
         if (!this.workspace || this.isInFlyout || this.workspace.isDragging()) {

diff --git a/src/scratch/blocks/Binary/Indicators/bb_statement.js b/src/scratch/blocks/Binary/Indicators/bb_statement.js
@@ -38,7 +38,7 @@ Blockly.Blocks.bb_statement = {
             tooltip          : translate('Calculates Bollinger Bands (BB) from a list with a period'),
             previousStatement: null,
             nextStatement    : null,
-            category         : 'indicators',
+            category         : Blockly.Categories.Indicators,
         };
     },
     meta(){

diff --git a/src/scratch/blocks/Binary/Indicators/bba_statement.js b/src/scratch/blocks/Binary/Indicators/bba_statement.js
@@ -4,7 +4,10 @@ import { translate }   from '../../../../utils/lang/i18n';
 
 Blockly.Blocks.bba_statement = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             message0: translate('set %1 to Bollinger Bands Array %2 %3'),
             message1: '%1',
             args0   : [
@@ -35,7 +38,14 @@ Blockly.Blocks.bba_statement = {
             tooltip          : translate('Calculates Bollinger Bands (BB) list from a list with a period'),
             previousStatement: null,
             nextStatement    : null,
-        });
+            category         : Blockly.Categories.Indicators,
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Bollinger Bands Statement'),
+            'description' : translate('Bollinger Bands Description'),
+        };
     },
     onchange           : Blockly.Blocks.bb_statement.onchange,
     requiredParamBlocks: ['input_list', 'period', 'std_dev_multiplier_up', 'std_dev_multiplier_down'],