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

Revert "Consistently format text bubbles"

Browse source 
This reverts commit bc61e547b5.
This commit is contained in:
DD Liu 2020-03-19 12:40:55 -04:00
parent 7330129cc6
commit 2a42285abe
2 changed files with 14 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/blocks/scratch3_looks.js
View file

@ -233,26 +233,6 @@ class Scratch3LooksBlocks {
this._positionBubble(target);
}
/**
* Properly format text for a text bubble.
* @param {string} text The text to be formatted
* @return {string} The formatted text
* @private
*/
_formatBubbleText (text) {
if (text === '') return text;
// Limit decimal precision to 2 digits.
if (typeof text === 'number') {
text = parseFloat(text.toFixed(2));
}
// Limit the length of the string.
text = String(text).substr(0, Scratch3LooksBlocks.SAY_BUBBLE_LIMIT);
return text;
}
/**
* The entry point for say/think blocks. Clears existing bubble if the text is empty.
* Set the bubble custom state and then call _renderBubble.
@ -264,7 +244,7 @@ class Scratch3LooksBlocks {
_updateBubble (target, type, text) {
const bubbleState = this._getBubbleState(target);
bubbleState.type = type;
bubbleState.text = this._formatBubbleText(text);
bubbleState.text = text;
bubbleState.usageId = uid();
this._renderBubble(target);
}
@ -320,7 +300,12 @@ class Scratch3LooksBlocks {
say (args, util) {
// @TODO in 2.0 calling say/think resets the right/left bias of the bubble
this.runtime.emit('SAY', util.target, 'say', args.MESSAGE);
let message = args.MESSAGE;
if (typeof message === 'number') {
message = parseFloat(message.toFixed(2));
}
message = String(message).substr(0, Scratch3LooksBlocks.SAY_BUBBLE_LIMIT);
this.runtime.emit('SAY', util.target, 'say', message);
}
sayforsecs (args, util) {
@ -340,7 +325,7 @@ class Scratch3LooksBlocks {
}
think (args, util) {
this.runtime.emit('SAY', util.target, 'think', args.MESSAGE);
this._updateBubble(util.target, 'think', String(args.MESSAGE).substr(0, Scratch3LooksBlocks.SAY_BUBBLE_LIMIT));
}
thinkforsecs (args, util) {