Commit graph

98 commits

Author SHA1 Message Date
Andrew Sliwinski
aade0b4121 Merge from upstream 2014-04-10 12:25:43 -07:00
Andrew Sliwinski
a9b4a6d731 Restore implicit type conversion in reporter 2014-04-10 11:34:01 -07:00
Shane M. Clements
62abf8d547 Merge pull request #54 from prokls/master
SensingPrims.primTimestamp and Daylight Savings Time
2014-04-09 23:33:06 -06:00
Shane M. Clements
4378cdb6fd Merge pull request #55 from prokls/prokls/activeElement
Check focus using document.activeElement
2014-04-09 22:10:54 -06:00
Andrew Sliwinski
b301a2f8b9 Allow implicit type conversion. 2014-04-09 19:26:25 -07:00
Andrew Sliwinski
14a9f13ce8 Update readme to refect simplification of installation / test running 2014-04-09 01:22:51 -07:00
Andrew Sliwinski
dcb00fc634 Add explicit engine to package.json Resolves GH-60 2014-04-09 01:21:05 -07:00
Andrew Sliwinski
fcd77d7dd8 Add post install hook to package.json as to remove unnecessary manual jQuery install step 2014-04-09 01:19:34 -07:00
Andrew Sliwinski
189153e2a0 Tests should follow existing style conventions 2014-04-09 01:18:14 -07:00
Andrew Sliwinski
586f29a285 Minor formatting and type casting adjustment to make codebase internally consistent 2014-04-09 01:17:50 -07:00
Andrew Sliwinski
1bd49e4e49 Add governance testing based on JSCS and consolidate test suite to makefile. Resolves GH-57 2014-04-09 01:17:04 -07:00
Lukas Prokop
a3cd2c796a Extend .is(:focus) check to activeElement.
If this test has to be used more often, I suggest to use a prototype.

This bugfix is based on various SO threads like
  http://stackoverflow.com/questions/18850219/testing-for-focus-an-angularjs-directive
2014-03-21 23:10:19 +01:00
Lukas Prokop
b88e215f8a Use toBeCloseTo for javascript numbers.
5280 is the precise number of days between these two dates
as currently implemented.

Between
  1st of Jan 2000 23:59 and 16th of June 2014 00:00 -> 5280
  1st of Jan 2000 00:00 and 16th of June 2014 23:59 -> 5281.999...8

Related to issue #54.
2014-03-21 20:36:51 +01:00
Lukas Prokop
4b7fe36066 Fix DST issue in SensingPrims.primTimestamp. 2014-03-21 19:54:59 +01:00
Shane M. Clements
623dce5402 Merge pull request #43 from brianpilati/master
Edited - Finished the doAsk and answer functionality and brought the project under test.
2014-03-10 21:36:20 -06:00
Brian Pilati
6e6524e481 updates to elevate my code to scratch standards 2014-03-10 21:04:56 -06:00
Brian Pilati
365e93f16a some final touches to the doAsk/answer project 2014-03-10 10:16:31 -06:00
Brian Pilati
b6e9ecf0b5 oops forgot to delete an unneeded method 2014-03-09 12:00:49 -06:00
Brian Pilati
e59b279be1 updates to finish doAsk 2014-03-09 11:59:38 -06:00
Brian Pilati
6f54f52f3c Added functionality to hide the doAsk prompt on a stopAll call with tests 2014-03-08 09:41:01 -07:00
Brian Pilati
1beed456cc updates to add "ask" functionality 2014-03-08 00:46:59 -07:00
Brian Pilati
3842832e52 additional tests in preparation to adding the "ask" functionality 2014-03-07 10:47:50 -07:00
Brian Pilati
23cc21b7d9 updates to bring more of the Scratch project under test ... still baby-steps 2014-03-07 10:47:07 -07:00
Brian Pilati
6699864097 oops didn't think about updating the compare.html file 2014-03-07 10:47:06 -07:00
Brian Pilati
051e1e4778 bringing the Scratch html5 project under test 2014-03-07 10:47:06 -07:00
Shane M. Clements
5f6195177a Fixed opcode debugging for arguments 2014-02-20 10:55:02 -07:00
Nathan Dinsmore
eb4dc36b10 Merge branch 'master' of github.com:LLK/scratch-html5 2014-02-19 23:01:40 -05:00
Nathan Dinsmore
1112081a4f Fixed mouse events 2014-02-19 22:53:32 -05:00
Shane M. Clements
87eb36983b Fixed startup parameters for flash player. 2014-01-29 15:36:10 +00:00
Nathan Dinsmore
b2862696f0 Fixed address hint alignment 2013-12-19 15:17:07 -05:00
Nathan Dinsmore
489a212fee Fixed #22
Modulo now behaves exactly like Scratch 1.4 and passes http://scratch.mit.edu/projects/13839488/
2013-12-19 15:11:02 -05:00
Nathan Dinsmore
0539393688 Fixed button and input styles in various browsers 2013-12-19 14:49:17 -05:00
Nathan Dinsmore
5c8e258423 Merge branch 'master' of github.com:LLK/scratch-html5 2013-11-16 15:44:12 -05:00
Nathan Dinsmore
2db0268305 Fixed resetting filters 2013-11-16 15:44:00 -05:00
Nathan Dinsmore
5cacaa8e1e Fixed focus outline on project ID field 2013-11-16 01:12:46 -05:00
Amos Blanton
d5b8daf634 Add Scratch 2 characters. 2013-11-15 21:38:35 +00:00
Nathan Dinsmore
0e062e7669 Merge github.com:djdolphin/scratch-html5 into test
Also improved filter performance, fixed edge cases, and implemented stage filters for color, brightness, and ghost.

Conflicts:
	js/Runtime.js
	js/Sprite.js
    js/primitives/LooksPrims.js

Tested with:
	http://scratch.mit.edu/projects/14315832/
2013-11-14 23:46:19 -05:00
Nathan Dinsmore
e3f10142a9 Fixed height of watchers on empty strings 2013-11-14 23:15:02 -05:00
Nathan Dinsmore
e74d03cb97 Fixed timer precision 2013-11-14 23:12:36 -05:00
Nathan Dinsmore
6c31987bbf Removed toFixed 2013-11-14 23:04:00 -05:00
Nathan Dinsmore
5c204b3774 Changed watcher behavior to be consistent with Flash player
Tested with:
  http://scratch.mit.edu/projects/14315470/
2013-11-14 23:02:16 -05:00
Nathan Dinsmore
07415badbe Merge branch 'master' of github.com:MathWizz/scratch-html5 into test
Conflicts:
	js/Interpreter.js
	js/primitives/LooksPrims.js
	js/primitives/MotionAndPenPrims.js
	js/primitives/Primitives.js
	js/primitives/SoundPrims.js
	js/primitives/VarListPrims.js

Tested with:
  http://scratch.mit.edu/projects/13841687/
  http://scratch.mit.edu/projects/2192048/
2013-11-14 22:27:52 -05:00
Shane M. Clements
27c277bf3c Merge pull request #37 from nathandinsmore/new-theme
Updated theme to be more like the Flash player
2013-11-14 18:47:36 -08:00
Nathan Dinsmore
f115c42b52 Prefixed 2013-11-14 20:21:04 -05:00
Nathan Dinsmore
c4b2652c12 Updated theme to be more like the Flash player
Also:
- The project input field now allows pasting of URLs
- The overlay cannot be clicked while the project is loading
2013-11-14 20:12:42 -05:00
Shane M. Clements
d302a6234c Merge pull request #33 from ipedrazas/master
Fixed the error 'createGainNode is not a function'
2013-11-12 09:49:11 -08:00
djdolphin
9f98f7ffb8 Fixed mistake in code 2013-11-05 20:59:48 -05:00
Ivan Pedrazas
a206f6ef86 Fixed the error 'createGainNode is not a function' with Firefox. createGainNode has been replaced with createGain 2013-11-05 23:00:19 +00:00
Shane M. Clements
01e38ecfc7 Merge pull request #29 from Hardmath123/master
Cleaner UI
2013-11-05 09:15:24 -08:00
Hardmath123
a0c414dbac Fixed conflicts, ready to merge. 2013-11-04 20:18:47 -08:00