improved

McSam · McSam · commit 4c26ad626905 · 2019-07-15T15:10:50.000+08:00
diff --git a/src/assets/sass/scratch/_toolbox.scss b/src/assets/sass/scratch/_toolbox.scss
@@ -1,6 +1,7 @@
 @import '../base/mixins';
 
 $category-colours: (
+    search          : #afffda,
     trade-definition: #303f9f,
     before-purchase : #00897b,
     during-purchase : #78909c,
@@ -114,4 +115,11 @@ $category-colours: (
             }
         }
     }
+
+    #search_input {
+        padding: 10px;
+        border-radius: 5px;
+        border: solid $grey 1px;
+        margin: 3px;
+    }
 }
diff --git a/src/scratch/blocks/Advanced/Functions/procedures_callreturn.js b/src/scratch/blocks/Advanced/Functions/procedures_callreturn.js
@@ -1,9 +1,14 @@
+import { translate } from '../../../../utils/lang/i18n';
+
 Blockly.Blocks.procedures_callreturn = {
     init() {
         this.arguments = [];
         this.previousDisabledState = false;
 
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             message0: '%1 %2',
             args0   : [
                 {
@@ -20,7 +25,15 @@ Blockly.Blocks.procedures_callreturn = {
             colour         : Blockly.Colours.BinaryProcedures.colour,
             colourSecondary: Blockly.Colours.BinaryProcedures.colourSecondary,
             colourTertiary : Blockly.Colours.BinaryProcedures.colourTertiary,
-        });
+            tooltip        : translate('Function with return value'),
+            category       : translate('functions'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Function with return value'),
+            'description' : translate('Function with return value Description'),
+        };
     },
     onchange              : Blockly.Blocks.procedures_callnoreturn.onchange,
     getProcedureDefinition: Blockly.Blocks.procedures_callnoreturn.getProcedureDefinition,
diff --git a/src/scratch/blocks/Advanced/Functions/procedures_defreturn.js b/src/scratch/blocks/Advanced/Functions/procedures_defreturn.js
@@ -6,7 +6,21 @@ Blockly.Blocks.procedures_defreturn = {
         this.arguments = [];
         this.argumentVarModels = [];
 
-        this.jsonInit({
+        this.jsonInit(this.definition());
+
+        // Enforce unique procedure names
+        const nameField = this.getField('NAME');
+        nameField.setValidator(Blockly.Procedures.rename);
+
+        // Render a ➕-icon for adding parameters
+        const fieldImage = new Blockly.FieldImage(plusIconDark, 24, 24, '+', () => this.onAddClick());
+        this.appendDummyInput('ADD_ICON').appendField(fieldImage);
+        this.moveInputBefore('ADD_ICON', 'RETURN');
+
+        this.setStatements(true);
+    },
+    definition(){
+        return {
             message0: translate('function %1 %2 %3'),
             message1: 'return %1',
             args0   : [
@@ -35,18 +49,15 @@ Blockly.Blocks.procedures_defreturn = {
             colour         : Blockly.Colours.BinaryProcedures.colour,
             colourSecondary: Blockly.Colours.BinaryProcedures.colourSecondary,
             colourTertiary : Blockly.Colours.BinaryProcedures.colourTertiary,
-        });
-
-        // Enforce unique procedure names
-        const nameField = this.getField('NAME');
-        nameField.setValidator(Blockly.Procedures.rename);
-
-        // Render a ➕-icon for adding parameters
-        const fieldImage = new Blockly.FieldImage(plusIconDark, 24, 24, '+', () => this.onAddClick());
-        this.appendDummyInput('ADD_ICON').appendField(fieldImage);
-        this.moveInputBefore('ADD_ICON', 'RETURN');
-
-        this.setStatements(true);
+            tooltip        : translate('Function def with return value'),
+            category       : translate('functions'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Function def with return value'),
+            'description' : translate('Function def with return value Description'),
+        };
     },
     onAddClick   : Blockly.Blocks.procedures_defnoreturn.onAddClick,
     onchange     : Blockly.Blocks.procedures_defnoreturn.onchange,
diff --git a/src/scratch/blocks/Advanced/Functions/procedures_ifreturn.js b/src/scratch/blocks/Advanced/Functions/procedures_ifreturn.js
@@ -9,7 +9,10 @@ Blockly.Blocks.procedures_ifreturn = {
     init() {
         this.hasReturnValue = true;
 
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             message0: translate('if %1 return %2'),
             args0   : [
                 {
@@ -26,7 +29,15 @@ Blockly.Blocks.procedures_ifreturn = {
             colourTertiary   : Blockly.Colours.BinaryProcedures.colourTertiary,
             previousStatement: null,
             nextStatement    : null,
-        });
+            tooltip          : translate('Function If Else'),
+            category         : translate('functions'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Function If else'),
+            'description' : translate('Function If else Description'),
+        };
     },
     /**
      * Create XML to represent whether this block has a return value.
diff --git a/src/scratch/blocks/Advanced/List/lists_create_with.js b/src/scratch/blocks/Advanced/List/lists_create_with.js
@@ -3,7 +3,15 @@ import { translate }    from '../../../../utils/lang/i18n';
 
 Blockly.Blocks.lists_create_with = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+
+        // Render a ➕-icon for adding additional `lists_statement` blocks
+        const fieldImage = new Blockly.FieldImage(plusIconDark, 25, 25, '', () => this.onIconClick());
+        this.appendDummyInput('ADD_ICON').appendField(fieldImage);
+        this.moveInputBefore('ADD_ICON', 'STACK');
+    },
+    definition(){
+        return {
             message0: translate('set %1 to create list with'),
             message1: '%1',
             args0   : [
@@ -24,12 +32,15 @@ Blockly.Blocks.lists_create_with = {
             colourTertiary   : Blockly.Colours.Binary.colourTertiary,
             previousStatement: null,
             nextStatement    : null,
-        });
-
-        // Render a ➕-icon for adding additional `lists_statement` blocks
-        const fieldImage = new Blockly.FieldImage(plusIconDark, 25, 25, '', () => this.onIconClick());
-        this.appendDummyInput('ADD_ICON').appendField(fieldImage);
-        this.moveInputBefore('ADD_ICON', 'STACK');
+            tooltip          : translate('Create List with'),
+            category         : translate('list'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Create list with'),
+            'description' : translate('Create list with description'),
+        };
     },
     onIconClick() {
         if (!this.workspace || this.isInFlyout) {
diff --git a/src/scratch/blocks/Binary/After Purchase/check_result.js b/src/scratch/blocks/Binary/After Purchase/check_result.js
@@ -3,7 +3,10 @@ import { translate } from '../../../../utils/lang/i18n';
 
 Blockly.Blocks.contract_check_result = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             message0: translate('Result is %1'),
             args0   : [
                 {
@@ -18,7 +21,14 @@ 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'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Check Result'),
+            'description' : translate('Check Result Description'),
+        };
     },
     onchange(event) {
         if (!this.workspace || this.isInFlyout || this.workspace.isDragging()) {
diff --git a/src/scratch/blocks/Binary/After Purchase/read_details.js b/src/scratch/blocks/Binary/After Purchase/read_details.js
@@ -3,7 +3,10 @@ import { translate } from '../../../../utils/lang/i18n';
 
 Blockly.Blocks.read_details = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             message0: translate('Contract Detail: %1'),
             args0   : [
                 {
@@ -17,7 +20,15 @@ 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'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Read Detail Block'),
+            'description' : translate('Read Detail Description'),
+
+        };
     },
     onchange(event) {
         if (!this.workspace || this.isInFlyout || this.workspace.isDragging()) {
diff --git a/src/scratch/blocks/Binary/After Purchase/trade_again.js b/src/scratch/blocks/Binary/After Purchase/trade_again.js
@@ -2,17 +2,27 @@ import { translate } from '../../../../utils/lang/i18n';
 
 Blockly.Blocks.trade_again = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+
+        // Ensure one of this type per statement-stack
+        this.setNextStatement(false);
+    },
+    definition(){
+        return {
             message0         : translate('Trade Again'),
             colour           : Blockly.Colours.Binary.colour,
             colourSecondary  : Blockly.Colours.Binary.colourSecondary,
             colourTertiary   : Blockly.Colours.Binary.colourTertiary,
             previousStatement: null,
             tooltip          : translate('Runs the trade block again'),
-        });
-
-        // Ensure one of this type per statement-stack
-        this.setNextStatement(false);
+            category         : translate('after-purchase'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Trade Again'),
+            'description' : translate('Trade Again Description'),
+        };
     },
     onchange(event) {
         if (!this.workspace || this.isInFlyout || this.workspace.isDragging()) {
diff --git a/src/scratch/blocks/Binary/Before Purchase/ask_price.js b/src/scratch/blocks/Binary/Before Purchase/ask_price.js
@@ -3,7 +3,10 @@ import { translate }          from '../../../../utils/lang/i18n';
 
 Blockly.Blocks.ask_price = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             message0: translate('Ask Price %1'),
             args0   : [
                 {
@@ -18,7 +21,14 @@ 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'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Ask Price'),
+            'description' : translate('Ask Price Description'),
+        };
     },
     onchange(event) {
         if (!this.workspace || this.isInFlyout || this.workspace.isDragging()) {
diff --git a/src/scratch/blocks/Binary/Before Purchase/payout.js b/src/scratch/blocks/Binary/Before Purchase/payout.js
@@ -3,7 +3,10 @@ import { translate }         from '../../../../utils/lang/i18n';
 
 Blockly.Blocks.payout = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+    },
+    definition(){
+        return {
             message0: translate('Payout %1'),
             args0   : [
                 {
@@ -18,7 +21,14 @@ Blockly.Blocks.payout = {
             colourSecondary: Blockly.Colours.Binary.colourSecondary,
             colourTertiary : Blockly.Colours.Binary.colourTertiary,
             tooltip        : translate('Payout for selected proposal'),
-        });
+            category       : translate('before-purchase'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Payout'),
+            'description' : translate('Payout Description'),
+        };
     },
     onchange(event) {
         if (!this.workspace || this.isInFlyout || this.workspace.isDragging()) {
diff --git a/src/scratch/blocks/Binary/Before Purchase/purchase.js b/src/scratch/blocks/Binary/Before Purchase/purchase.js
@@ -3,7 +3,13 @@ import { translate }                                 from '../../../../utils/lan
 
 Blockly.Blocks.purchase = {
     init() {
-        this.jsonInit({
+        this.jsonInit(this.definition());
+
+        // Ensure one of this type per statement-stack
+        this.setNextStatement(false);
+    },
+    definition(){
+        return {
             message0: translate('Purchase %1'),
             args0   : [
                 {
@@ -17,10 +23,14 @@ Blockly.Blocks.purchase = {
             colourSecondary  : Blockly.Colours.Binary.colourSecondary,
             colourTertiary   : Blockly.Colours.Binary.colourTertiary,
             tooltip          : translate('Payout for selected proposal'),
-        });
-
-        // Ensure one of this type per statement-stack
-        this.setNextStatement(false);
+            category         : translate('before-purchase'),
+        };
+    },
+    meta(){
+        return {
+            'display_name': translate('Puchase'),
+            'description' : translate('Purchase Description'),
+        };
     },
     onchange(event) {
         if (!this.workspace || this.isInFlyout || this.workspace.isDragging()) {
diff --git a/src/scratch/hooks/data_category.js b/src/scratch/hooks/data_category.js
diff --git a/src/scratch/hooks/flyout_base.js b/src/scratch/hooks/flyout_base.js
diff --git a/src/scratch/hooks/toolbox.js b/src/scratch/hooks/toolbox.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`@import '../base/mixins';`
`2`	`2`
`3`	`3`	`$category-colours: (`
	`4`	`+ search : #afffda,`
`4`	`5`	`trade-definition: #303f9f,`
`5`	`6`	`before-purchase : #00897b,`
`6`	`7`	`during-purchase : #78909c,`
`@@ -114,4 +115,11 @@ $category-colours: (`
`114`	`115`	`}`
`115`	`116`	`}`
`116`	`117`	`}`
	`118`	`+`
	`119`	`+ #search_input {`
	`120`	`+ padding: 10px;`
	`121`	`+ border-radius: 5px;`
	`122`	`+ border: solid $grey 1px;`
	`123`	`+ margin: 3px;`
	`124`	`+ }`
`117`	`125`	`}`