Commit graph

999 commits

Author SHA1 Message Date
Tim Mickel
15ed57e7aa Merge branch 'develop' into feature/drag-surface
# Conflicts:
#	core/block_svg.js
2016-04-08 14:41:45 -04:00
Tim Mickel
5207ce24ab Merge pull request #181 from tmickel/feature/pants-width
Update MIN_BLOCK_X so statement-blocks start smaller
2016-04-08 13:51:14 -04:00
Tim Mickel
bb9bf2cfc0 Update MIN_BLOCK_X so statement-blocks start smaller 2016-04-08 13:47:26 -04:00
rachel-fenichel
9d763cec32 Merge pull request #177 from rachel-fenichel/feature/last_ghost_connection_list
Track dragging connections and ghost last in stack
2016-04-08 10:34:49 -07:00
Andrew Sliwinski
c1942bdc7b Initial mockup of LEGO WeDo blocks (#178)
Initial mockup of wedo blocks
2016-04-08 08:50:09 -04:00
Tim Mickel
c9515597e1 Move dragSurface.createDom up to inject.js 2016-04-07 23:00:33 -04:00
Tim Mickel
9f313251d3 Simplify model by removing isOnDragSurface_ 2016-04-07 22:58:05 -04:00
Tim Mickel
f02b8c7662 Merge pull request #175 from tmickel/bugfix/widget-div
Keep text-input widget div options to CSS class
2016-04-07 20:04:03 -04:00
rachel-fenichel
d892599b4f Track dragging connections and ghost last in stack 2016-04-07 13:22:07 -07:00
Tim Mickel
a26519c71e Merge pull request #176 from tmickel/feature/pants-belt
Update size of statement block space on top #169
2016-04-07 08:59:49 -04:00
Tim Mickel
d3be8ef904 Update size of statement block space on top #169 2016-04-06 21:12:45 -04:00
Tim Mickel
382a1f4f82 Keep text-input widget div options to CSS class 2016-04-06 21:01:55 -04:00
rachel-fenichel
cb7391dbec Merge pull request #174 from LLK/revert-172-feature/last_ghost
Revert "Correctly ghost the last block in the stack."
2016-04-06 17:49:47 -07:00
rachel-fenichel
bbe4855de4 Revert "Correctly ghost the last block in the stack." 2016-04-06 17:48:59 -07:00
rachel-fenichel
8af37d7f53 Merge pull request #172 from rachel-fenichel/feature/last_ghost
Correctly ghost the last block in the stack.
2016-04-06 17:30:36 -07:00
rachel-fenichel
1c8d86a713 Merge pull request #171 from rachel-fenichel/cleanup/insertion_marker
Rename ghosts to insertion markers and only store on global insertion marker
2016-04-06 17:18:48 -07:00
rachel-fenichel
b20a278c9b Correctly ghost the last block in the stack 2016-04-06 15:45:21 -07:00
rachel-fenichel
3a07be9b5c Store a single global insertion marker instead on one per block 2016-04-06 14:57:16 -07:00
rachel-fenichel
002e470ccd ghost -> insertion marker 2016-04-06 14:42:12 -07:00
Tim Mickel
efdc6a96b3 Merge pull request #164 from tmickel/feature/seventy-two
SNAP_RADIUS = 72;
2016-04-06 13:39:52 -04:00
Tim Mickel
579ce1597b Merge pull request #168 from tmickel/eslintignore-msg
Add /msg/* to eslintignore
2016-04-06 13:39:41 -04:00
Tim Mickel
c773ea12f0 Add /msg/* to eslintignore 2016-04-06 13:39:01 -04:00
Tim Mickel
7ed228aa89 Merge pull request #167 from tmickel/feature/eslintignore
Ignore compiled files in eslint
2016-04-06 13:36:20 -04:00
Tim Mickel
1223295476 Ignore compiled files in eslint 2016-04-06 13:35:58 -04:00
Tim Mickel
0ac37a8c2f Merge pull request #166 from tmickel/feature/eslint
Additions to .eslintrc to add warnings and JSDoc check
2016-04-06 13:17:14 -04:00
Tim Mickel
cf0afcdc39 Remove no-redeclare .eslintrc rule 2016-04-06 13:16:23 -04:00
Tim Mickel
925b88c9d4 Add .eslintrc indentation rule for switch case 2016-04-06 13:13:48 -04:00
Tim Mickel
b7506c75b6 Add JSDoc rule to .eslintrc 2016-04-06 13:11:24 -04:00
Tim Mickel
0c8ebb709f Merge pull request #165 from tmickel/feature/eslint
Add basic .eslintrc
2016-04-06 13:05:29 -04:00
Tim Mickel
912126d655 Add basic .eslintrc
Our projects generally use .eslintrc. Eslint gives many, many lint warnings at this point (even though I've adjusted things to be more like Blockly). Eventually it would be good to pass through and fix things up and see if there are any conflicts with closure lint. In the meantime this will help us write correct code.
2016-04-06 13:04:52 -04:00
Tim Mickel
c2982af255 SNAP_RADIUS = 72; 2016-04-05 20:53:16 -04:00
Tim Mickel
fd27029b37 Merge pull request #162 from tmickel/feature/fields-rtl
Clean up of fields; have floating div render entire text box during edit
2016-04-05 20:47:07 -04:00
Tim Mickel
2fc35e5797 Add comments and CSS style for field refactor 2016-04-05 20:43:54 -04:00
rachel-fenichel
c032fd08bf Merge pull request #160 from rachel-fenichel/bugfix/pants_migration
Bugfix/pants migration
2016-04-05 17:41:46 -07:00
rachel-fenichel
73dc434a35 don't even try to grow pants blocks up 2016-04-05 17:40:11 -07:00
Tim Mickel
8c180f0c52 Add additonal X bump for WEBKIT 2016-04-05 19:43:41 -04:00
Tim Mickel
464946d358 Use calculated value for RTL offset 2016-04-05 19:41:04 -04:00
Tim Mickel
5d71c82203 Improve handling of field border radius and colour 2016-04-05 19:37:32 -04:00
Tim Mickel
154d4e1851 Draw text fields entirely using CSS during edit 2016-04-05 18:36:02 -04:00
rachel-fenichel
5780d3cf25 fix snapping a pants block to the ghosted location at the start of a stack 2016-04-05 12:47:44 -07:00
Tim Mickel
e413d47f4d Remove borderRect_, clean up, and fix RTL 2016-04-05 12:19:01 -04:00
Tim Mickel
4cbe8418fc Adding note about appendChild 2016-04-05 00:12:47 -04:00
Tim Mickel
76d0f07a75 Addressing cosmetic issues 2016-04-05 00:10:44 -04:00
Rodrigo Queiro
46ed2fa129 Merge pull request #155 from drigz/bugfix/field-active-area
Increase active area on one-field-blocks #132
2016-04-04 11:09:55 +02:00
Rodrigo Queiro
a6a39fb49b Use text cursor on whole of horizontal input field
We do this by applying the style to the same element we apply the click
target to, ie the whole block if it only has one field.
2016-04-04 11:07:20 +02:00
Tim Mickel
c4e22097ff Fix Blockly.createMainWorkspace_ docstring 2016-04-02 16:26:40 -04:00
Tim Mickel
bc75b84aa8 Resize drag surface using only CSS 2016-04-02 16:24:47 -04:00
Tim Mickel
8940a6cc71 Block translations in function; translate before drag surface. 2016-04-01 17:53:02 -04:00
Tim Mickel
e8c0346378 Fix positioning of drag surface using relative container 2016-04-01 17:32:01 -04:00
Tim Mickel
5c0522638e Public dragSurface for BlockSvg 2016-04-01 17:05:43 -04:00