scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-08-28 22:30:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #660 from Kenny2github/patch-1

Browse source 
Add [string] contains [string] block
This commit is contained in:
Andrew Sliwinski 2017-08-10 10:44:01 -04:00 • committed by GitHub
commit 6988571eb8
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/blocks/scratch3_operators.js
View file

@ -30,6 +30,7 @@ class Scratch3OperatorsBlocks {
operator_join: this.join, operator_join: this.join,
operator_letter_of: this.letterOf, operator_letter_of: this.letterOf,
operator_length: this.length, operator_length: this.length,
operator_contains: this.contains,
operator_mod: this.mod, operator_mod: this.mod,
operator_round: this.round, operator_round: this.round,
operator_mathop: this.mathop operator_mathop: this.mathop
@ -106,6 +107,13 @@ class Scratch3OperatorsBlocks {
length (args) { length (args) {
return Cast.toString(args.STRING).length; return Cast.toString(args.STRING).length;
} }
contains (args) {
const format = function (string) {
return Cast.toString(string).toLowerCase();
};
return format(args.STRING1).includes(format(args.STRING2));
}
mod (args) { mod (args) {
const n = Cast.toNumber(args.NUM1); const n = Cast.toNumber(args.NUM1);

7
test/unit/blocks_operators.js
View file

@ -141,6 +141,13 @@ test('length', t => {
t.end(); t.end();
}); });
test('contains', t => {
t.strictEqual(blocks.contains({STRING1: 'hello world', STRING2: 'hello'}), true);
t.strictEqual(blocks.contains({STRING1: 'foo', STRING2: 'bar'}), false);
t.strictEqual(blocks.contains({STRING1: 'HeLLo world', STRING2: 'hello'}), true);
t.end();
});
test('mod', t => { test('mod', t => {
t.strictEqual(blocks.mod({NUM1: 1, NUM2: 1}), 0); t.strictEqual(blocks.mod({NUM1: 1, NUM2: 1}), 0);
t.strictEqual(blocks.mod({NUM1: 3, NUM2: 6}), 3); t.strictEqual(blocks.mod({NUM1: 3, NUM2: 6}), 3);