Tim Mickel
382a1f4f82
Keep text-input widget div options to CSS class
2016-04-06 21:01:55 -04: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
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
85f2613b7f
Merge pull request #156 from tmickel/google-master-april-1
...
Merge Google/master and Google/develop
2016-04-01 15:07:16 -04:00
Tim Mickel
cb29cef475
Recompile
2016-04-01 15:07:00 -04:00
Tim Mickel
afaafc1e5b
Fix passing of secondary and tertiary colours
2016-04-01 15:04:08 -04:00
Tim Mickel
3cbe49e37a
Merge branch 'develop' of https://github.com/google/blockly into google-master-april-1
...
# Conflicts:
# blockly_compressed_horizontal.js
# core/block.js
# core/block_render_svg_vertical.js
# core/connection.js
# core/inject.js
2016-04-01 15:00:44 -04:00
Tim Mickel
a65109f423
Merge remote-tracking branch 'Google/master' into google-master-april-1
...
# Conflicts:
# blockly_compressed_horizontal.js
# blockly_uncompressed_vertical.js
# blocks_compressed.js
# core/block.js
# core/block_svg.js
# core/blockly.js
# core/connection.js
# core/field_textinput.js
# core/workspace_svg.js
# generators/lua/lists.js
# generators/lua/text.js
# msg/js/he.js
# msg/js/id.js
# msg/js/sr.js
# msg/js/zh-hant.js
# msg/json/en.json
2016-04-01 14:44:46 -04:00
Neil Fraser
b7f73d60bb
Routine recompile.
2016-03-31 14:19:34 -07:00
Neil Fraser
7e195d47c7
Merge branch 'master' into develop
2016-03-31 12:45:29 -07:00
rachel-fenichel
1487a9e1d0
Merge pull request #302 from rachel-fenichel/cleanup/block_remove_rendered
...
Move Blockly.Block rendered into Blockly.BlockSvg
2016-03-31 14:17:32 -04:00
rachel-fenichel
806249309e
Merge pull request #305 from rachel-fenichel/cleanup/is_connected
...
Add isConnected() to connections.
2016-03-31 14:17:12 -04:00
Rodrigo Queiro
4daf3cd16f
Increase active area on one-field-blocks
...
If a block only has one field, the mouseup event (which triggers editing
of editable fields) will be bound to the block instead of the field.
Fixes #132 .
2016-03-31 16:43:17 +02:00
Neil Fraser
39f7e6660e
Add category UI event. Issue #306 .
2016-03-31 02:04:23 -07:00
Niklas Laxström
9471ea63d3
Localisation updates from https://translatewiki.net .
2016-03-31 07:48:11 +02:00
Neil Fraser
83925b2fe7
Merge branch 'master' into develop
2016-03-30 20:52:02 -07:00
rachel-fenichel
d22dc5ced8
don't drive pants blocks down the page
2016-03-30 16:57:29 -07:00
rachel-fenichel
ae1a0aab8a
add isConnected() to connections.
2016-03-30 15:10:59 -07:00
Tim Mickel
0169999d86
Merge pull request #144 from tmickel/feature/mouse-wheel
...
Distinguish mouse wheel/zoom and implement scrolling
2016-03-30 14:15:01 -04:00
Tim Mickel
6a341a2193
Semicolon and note about startDragMetrics
2016-03-30 14:14:02 -04:00
Tim Mickel
18a1b9a68b
Merge pull request #145 from rachel-fenichel/cleanup/switch
...
Clean up isConnectionAllowed
2016-03-30 13:31:46 -04:00
Neil Fraser
2b71aacac6
Fix error in closing text input if block is deleted. See PR #300 and Issue #303 .
2016-03-29 21:41:20 -07:00
Neil Fraser
a52c3e9db4
Roll back PR #300 due to issue #303 .
2016-03-29 20:56:15 -07:00
