Skip to content

Highlighting #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
mrjacobbloom wants to merge 52 commits into from
Closed

Highlighting #262

mrjacobbloom wants to merge 52 commits into from

Conversation

@mrjacobbloom
Copy link
Contributor

@mrjacobbloom mrjacobbloom commented May 3, 2017 •
edited by PullJosh
Loading

see #255

This is my implementation of block highlighting. I've added the changes people requested. Namely:

  • prettier highlighting for the blocks with rounded edges
  • highlight both at the same time
  • turn it on or off in the new View menu

all the commits from #258 got attached to this PR which is lame, but if you compare the branches the only changes are ones relevant to this PR

hl

@mrjacobbloom
rough beginnings of reworked block code
00e0c8f
@mrjacobbloom
add Attr constructor; transition from getOffset() to block.left() (et…
b97017c 
…c.); rewrite json2html
@mrjacobbloom
fix bug where sometimes blocks didn’t symbolically attach to parent
83a3cb6
@mrjacobbloom
bugfix: now you can add block to beginning of c-stack
0bfd3fa
@mrjacobbloom
move some event listeners around, resolve #242 in the process
60aefcf
@mrjacobbloom
fix duplicate functionality
60ca20a
@mrjacobbloom
disable context menu on “body” element
6d1abd3
@mrjacobbloom
resolve error when rendering blank attributes
a119253
@mrjacobbloom
start on file import/export
6a18aa1
@mrjacobbloom
bug fixes related to file import
0b41c56
@mrjacobbloom
I got single-file export to work :D
8ea1828
@mrjacobbloom
start fixing multiple html files
d1234f5
@mrjacobbloom
fixed bugs in switching between multiple html files
5e9ee30
@mrjacobbloom
add CSS blocks and export
00ce0e0
@mrjacobbloom
finish file import
d316201
@mrjacobbloom
make change described by @iamunknown2 (close #252)
b274b75
@mrjacobbloom
fix bug where imported files weren’t editable
3f14fd8
@mrjacobbloom
fix items sometimes reversing in order on drop (thanks @iamunknown2 f…
60e2d75 
…or reporting)
@mrjacobbloom
clean up coords code
45e2cdb
@mrjacobbloom
fix tutorial 2
e9c62e9
@mrjacobbloom
Merge branch 'gh-pages' of github.com:ElementalCode/elemental into re…
e3d3962 
…work-blocks
@mrjacobbloom
figured out the issues with CSS files
1d7225c
@mrjacobbloom
limit context menu to blocks in script area
c02f4a4
@mrjacobbloom
fix issues with loose blocks not being JSON’d correctly
d20fb48
@mrjacobbloom
rename a whole bunch of things
e89a78d
@mrjacobbloom
add default blocks to new CSS files
782dd42
@mrjacobbloom
refactor dropdown code and add to rule block
7e2bc49
@mrjacobbloom
rename Attr to BlockAttribute to match other constructors’ snooty names
8d1effb
@mrjacobbloom
Merge branch 'gh-pages' of github.com:ElementalCode/elemental into re…
64e095f 
…work-blocks
@mrjacobbloom
remove old files
7594037
@mrjacobbloom
move function blocksToJSON to block2json.js for obvious reasons
80af4f2
@mrjacobbloom
remove default scriptingArea contents since they’re always generated …
68dd70f 
…programmatically
@mrjacobbloom
bugfix: default blocks in new CSS files were marked inPalette
52bf2e2
@mrjacobbloom
clean up blocks2json a lil
e5da901
@mrjacobbloom
update zebra to use the new system
0427ae8
@mrjacobbloom
tweaks
3177207
@mrjacobbloom
switch from strings for block types to enum
405eaff
@mrjacobbloom
bug fix with enum
2f25591
@mrjacobbloom
remove a lot of old code and random nits
48ba312
@mrjacobbloom
remove duplicate code
a22cf9c
@mrjacobbloom
element/block highlighting mockup
27c61d9
@mrjacobbloom
slightly simplify file import
1f27da9
@mrjacobbloom
a naive attempt to clog potential memory leaks
cdafc90
@mrjacobbloom
more attempt to plug memory leaks, p.s. this is miserable and I have …
cf3550f 
…no idea how to know if it works
@mrjacobbloom
tpyo
645f8e0
@mrjacobbloom
delEt aLL th1NGS
ec872a8
@mrjacobbloom
everything is garbage
769003a
@mrjacobbloom
bugfix that I don’t understand why it’s necessary but ok
fe6d86b
@mrjacobbloom
Merge branch 'rework-blocks' of github.com:ElementalCode/elemental in…
a4369a6 
…to element-highlighting

# Conflicts:
#	resources/js/blocks.js
@mrjacobbloom
Merge branch 'gh-pages' of github.com:ElementalCode/elemental into el…
ba131de 
…ement-highlighting

# Conflicts:
#	resources/js/block2json.js
#	resources/js/blocks.js
#	resources/js/tutorials/2.js
@mrjacobbloom
garbage collection; per request:
44e3941 
- prettier (rounded) block highlighting
- highlight both block and element simultaneously
@mrjacobbloom
make highlighting toggleable, more garbage collection stuff
5fe6909
mrjacobbloom added a commit that referenced this pull request May 5, 2017
@mrjacobbloom
duplicate changes from #262
6604fbf
@mrjacobbloom mrjacobbloom mentioned this pull request May 5, 2017
Open
3 tasks
@mrjacobbloom
Copy link
Contributor Author

mrjacobbloom commented May 5, 2017

closing in favor of #263

@mrjacobbloom mrjacobbloom deleted the element-highlighting branch May 5, 2017 05:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@mrjacobbloom @matthewr6 @towerofnix