Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
a5bb982
Import Blocks from scratch-blocks branch
May 6, 2019
5cfb9a7
Update Build scripts
May 6, 2019
4b99149
Update package.json
May 6, 2019
53ed439
Update const options
May 6, 2019
7bc7a5b
Update CSS + XMLs
May 6, 2019
f568a91
Pull changes from scratch-blocks
May 6, 2019
6d6d05e
Pull overrides
May 6, 2019
9208077
Customise blockly/index
May 6, 2019
c8094b3
Update setBlockTextColor
May 6, 2019
ba92490
Emit event type only, restore original check_result
May 6, 2019
2190a09
Update package-lock.json
May 6, 2019
ed51001
Shadow blocks for restart_* blocks
May 6, 2019
88eeeba
Shadow blocks for restart_* blocks
May 6, 2019
39bb073
Block updates
May 7, 2019
21b1267
Blockly/Scratch overrides
May 7, 2019
544c222
do disableStrayBlocks(), consider as main block
May 7, 2019
716186d
Add as global variable
May 7, 2019
d81d4b2
Update package.json & package-lock.json
May 7, 2019
2302fee
Remove $.notify() debug messaging
May 7, 2019
e3a03c6
Remove unused eslint exceptions
May 7, 2019
4235094
Restore original Blockly contextMenu
May 7, 2019
d942a0d
Fix typo that would render incorrect block shape
May 7, 2019
6018cc5
Set shadow block values to be consistent with Binary Bot
May 7, 2019
6cdd4f2
Update label to be consistent with Binary Bot
May 7, 2019
72743b0
Remove unwanted child
May 7, 2019
d6e67a6
Fix temp QA menu labels to scroll correctly
May 7, 2019
bad7197
Remove contextMenu overrides
May 7, 2019
473cf83
Don't use ES6 in generated JS code
May 7, 2019
eb6f108
Don't re-use procedures_callnoreturn generator code
May 7, 2019
bdfeb54
Fix generator code
May 7, 2019
5957c03
Re-render procedure call-blocks when adding params
May 7, 2019
27ea5b9
Fix logic that retrieves input_list value, and update gen. code
May 14, 2019
e2658fd
Move workspace code generation into try-catch block
May 14, 2019
5ff0d14
Expect value for input_list, incl. input_list type check
May 14, 2019
30c2157
Update checks for lists_isEmpty & text_isEmpty, meet condition w/ und…
May 14, 2019
35f6dd2
Do not dispose blocks loaded by this loader-block
May 14, 2019
208c323
Only attempt to load after onFinishEditing_, don't delete blocks
May 14, 2019
0234c4f
Refactor loading remote blocks, don't delete blocks
May 14, 2019
d1a6fe7
Contrain math_number to number formats only
May 14, 2019
c1630bc
Emit bot.init when changing symbol
May 15, 2019
249e66f
Fix typo
May 15, 2019
4aa6e9f
Reconnect children with detachment issues, rather than disposing them
May 15, 2019
49cf640
Fix typo
May 15, 2019
34ae55d
Fix typo in prime function declaration
May 15, 2019
e7f041d
Remove extra space behind WHOLE
May 15, 2019
432ebc5
Fix expression precedence in asin, acos, atan operations
May 15, 2019
3dca14a
Notify will now fallback to <empty message> when none specified
May 15, 2019
a450a36
Do not use ES6 in generated code
May 15, 2019
86de543
Prefix some dropdown options with 'letter' like in Blockly
May 15, 2019
043a96d
Use object function as validator function
May 15, 2019
1e60dbe
Create math_number_positive block
May 15, 2019
4d2c4bb
Update some blocks to have math_number_positive shadow blocks
May 15, 2019
eff6ba7
Move function declaration to own definition
May 15, 2019
dab7473
Add infinite loop trap to while-loop block
May 15, 2019
51dda28
Define getIndex function in code generation
May 15, 2019
c33b00c
Do not allow field interactions when blocks are in flyout
May 15, 2019
f3f8e34
Import gesture.js override
May 15, 2019
94959a4
Create styling rules for highlighted blocks
May 15, 2019
6a1c820
Fix eslint errors & warnings
May 15, 2019
bcb9563
Merge branch 'dev' of github.com:binary-com/binary-bot into scratch-b…
May 15, 2019
1b1b6a3
package-lock.json
May 15, 2019
007e78a
Set shadow blocks for indicator input_lists
May 15, 2019
8cadea3
Remove semicolon
May 16, 2019
d9734ba
Update regex patterns for math_number + math_number_positive
May 16, 2019
0ed4d93
Re-add files elemen
May 16, 2019
4e12df7
Fix number regex pattern
May 28, 2019
8a78eb8
Update packages
May 28, 2019
6ff577f
Update package-lock.json
May 28, 2019
74c5191
Merge branch 'dev' of github.com:binary-com/binary-bot into scratch-b…
May 28, 2019
8844d25
Make Lastpass ignore text input
Jun 3, 2019
c9770e5
Refactor comparison functions
Jun 3, 2019
2285882
Fix while loop logic
Jun 4, 2019
ece0156
Simplify sorting by removing ignore_case option
Jun 10, 2019
1d62e0e
Fix eslinting errors
Jun 10, 2019
5979699
Remove loop trap
Jun 10, 2019
cd43147
Re-add loop trap to controls_whileUntil
Jun 10, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"Blockly": false,
"trackJs": false,
"jest": false,
"goog": false,
"dataLayer": false
},
"plugins": [
Expand Down
2 changes: 2 additions & 0 deletions gulp/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ gulp.task(
'copy-jquery-img',
'copy-binary-style-css',
'copy-binary-style-img',
'copy-scratch-media',
'copy-js',
'pull-blockly-translations',
done => {
Expand All @@ -81,6 +82,7 @@ gulp.task(
'copy-binary-style-css',
'copy-binary-style-img',
'copy-js',
'copy-scratch-media',
'pull-blockly-translations'
)
);
7 changes: 3 additions & 4 deletions gulp/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ gulp.task(
'bundle-js',
gulp.parallel(done => {
gulp.src([
'./node_modules/blockly/blockly_compressed.js',
'./node_modules/blockly/blocks_compressed.js',
'./node_modules/blockly/javascript_compressed.js',
'./node_modules/blockly/msg/messages.js',
'./node_modules/scratch-blocks/blockly_compressed_vertical.js',
'./node_modules/scratch-blocks/msg/messages.js',
'./node_modules/blockly/generators/javascript.js',
])
.pipe(concat('bundle.js'))
.pipe(rev())
Expand Down
5 changes: 5 additions & 0 deletions gulp/static.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,8 @@ gulp.task(
'copy-binary-style-img',
gulp.series(() => gulp.src('node_modules/binary-style/src/images/**').pipe(gulp.dest('www/image/binary-style')))
);

gulp.task(
'copy-scratch-media',
gulp.series(() => gulp.src('node_modules/scratch-blocks/media/**').pipe(gulp.dest('www/image/scratch')))
);
Loading