scratchfoundation/scratch-html5
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor formatting and type casting adjustment to make codebase internally consistent

Browse source
This commit is contained in:
Andrew Sliwinski 2014-04-09 01:17:50 -07:00
parent 1bd49e4e49
commit 586f29a285
10 changed files with 259 additions and 217 deletions

2
js/primitives/Primitives.js
View file

@ -46,7 +46,7 @@ Primitives.prototype.addPrimsTo = function(primTable) {
primTable['computeFunction:of:'] = this.primMathFunction;
// String primitives
primTable['concatenate:with:'] = function(b) { return '' + interp.arg(b, 0) + interp.arg(b, 1); };
primTable['concatenate:with:'] = function(b) { return (interp.arg(b, 0) + interp.arg(b, 1)).toString(); };
primTable['letter:of:'] = this.primLetterOf;
primTable['stringLength:'] = function(b) { return interp.arg(b, 0).length; };

6
js/primitives/SensingPrims.js
View file

@ -33,7 +33,7 @@ SensingPrims.prototype.addPrimsTo = function(primTable) {
primTable['getAttribute:of:'] = this.primGetAttribute;
primTable['timeAndDate'] = function(b){ return runtime.getTimeString(interp.arg(b, 0)); };
primTable['timeAndDate'] = function(b) { return runtime.getTimeString(interp.arg(b, 0)); };
primTable['timestamp'] = this.primTimestamp;
};
@ -181,8 +181,8 @@ SensingPrims.prototype.primDoAsk= function(b) {
showBubble(b, "doAsk");
var s = interp.targetSprite();
if (s !== null) {
interp.activeThread.paused = true;
s.showAsk();
interp.activeThread.paused = true;
s.showAsk();
}
};

35
js/primitives/VarListPrims.js
View file

@ -109,8 +109,8 @@ function findList(targetSprite, listName) {
VarListPrims.prototype.primReadList = function(b) {
var list = findList(interp.targetSprite(), interp.arg(b, 0));
if (list) {
var allOne = list.map(function(val) { return val.length; }).reduce(function(old,val) { return old + val; }, 0) === list.length;
return list.join(allOne ? '' : ' ');
var allOne = list.map(function(val) { return val.length; }).reduce(function(old,val) { return old + val; }, 0) === list.length;
return list.join(allOne ? '' : ' ');
}
};
@ -123,9 +123,13 @@ VarListPrims.prototype.primListDeleteLine = function(b) {
var list = findList(interp.targetSprite(), interp.arg(b, 1));
if (!list) return;
var line = interp.arg(b, 0);
if (line == 'all' || list.length == 0) list.length = 0;
else if (line == 'last') list.splice(list.length - 1, 1);
else if (parseInt(line, 10) - 1 in list) list.splice(parseInt(line, 10) - 1, 1);
if (line == 'all' || list.length == 0) {
list.length = 0;
} else if (line == 'last') {
list.splice(list.length - 1, 1);
} else if (parseInt(line, 10) - 1 in list) {
list.splice(parseInt(line, 10) - 1, 1);
}
};
VarListPrims.prototype.primListInsertAt = function(b) {
@ -134,9 +138,13 @@ VarListPrims.prototype.primListInsertAt = function(b) {
var newItem = interp.arg(b, 0);
var position = interp.arg(b, 1);
if (position == 'last') position = list.length;
else if (position == 'random') position = Math.round(Math.random() * list.length);
else position = parseInt(position, 10) - 1;
if (position == 'last') {
position = list.length;
} else if (position == 'random') {
position = Math.round(Math.random() * list.length);
} else {
position = parseInt(position, 10) - 1;
}
if (position > list.length) return;
list.splice(position, 0, newItem);
@ -148,12 +156,15 @@ VarListPrims.prototype.primListSetLine = function(b) {
var newItem = interp.arg(b, 2);
var position = interp.arg(b, 0);
if (position == 'last') position = list.length - 1;
else if (position == 'random') position = Math.floor(Math.random() * list.length);
else position = parseInt(position, 10) - 1;
if (position == 'last') {
position = list.length - 1;
} else if (position == 'random') {
position = Math.floor(Math.random() * list.length);
} else {
position = parseInt(position, 10) - 1;
}
if (position > list.length - 1) return;
list[position] = newItem;
};