Skip to content
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.

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

Hover drag #249

Closed
wants to merge 295 commits into from
Closed
Changes from 2 commits
Commits
Show all changes
295 commits
Select commit Hold shift + click to select a range
9c4f9bc
Add change and dirty event to tinymce logger.
ellatrix Feb 23, 2017
fc97736
Merge pull request #119 from WordPress/tinymce-logger
ellatrix Feb 23, 2017
b56a86f
Use nightly version for TinyMCE formatting demo.
ellatrix Feb 23, 2017
65bc805
Merge pull request #120 from WordPress/tinymce-nightly
ellatrix Feb 23, 2017
18e0a3e
Add Sketch file and designer contribution tips
jasmussen Feb 23, 2017
b1ab1e6
Merge pull request #121 from WordPress/add/sketch-file
jasmussen Feb 23, 2017
8b436e4
Merge Single TinyMCE Instance
ellatrix Feb 23, 2017
3e0d02d
Merge pull request #123 from WordPress/single-tinymce-instance
ellatrix Feb 23, 2017
a925b64
Use common navigation for single TinyMCE prototype
aduth Feb 23, 2017
67c6bf4
Remove unused shared navigation styles
aduth Feb 23, 2017
00cf814
tinymce-single: add toolbar styles from main prototype
ellatrix Feb 23, 2017
e28bc02
Merge pull request #125 from WordPress/single-tinymce-instance
ellatrix Feb 23, 2017
17679ec
Restore link styles
ellatrix Feb 23, 2017
acb2019
Move navigation.js to shared folder
ellatrix Feb 23, 2017
766c69f
Limit link styles to the editor content
ellatrix Feb 23, 2017
fec4752
Merge pull request #124 from WordPress/update/tinymce-single-nav
ellatrix Feb 23, 2017
6de5b49
tinymce-single: use same border style as main prototype
ellatrix Feb 23, 2017
0319274
Merge pull request #126 from WordPress/single-tinymce-instance
ellatrix Feb 23, 2017
a62d96c
Move block/new icons higher again after 00cf814c3dbbe6bcc2bb58cf7e8d2…
ellatrix Feb 24, 2017
574120f
tinymce-single: set active button for default alignment
ellatrix Feb 24, 2017
f04817c
Merge pull request #132 from WordPress/fix-tinymce-single-issues
ellatrix Feb 24, 2017
9df3863
tinymce-single: add image animations similar to main prototype
ellatrix Feb 24, 2017
68c974f
Merge pull request #135 from WordPress/tinymce-single-image-animation
ellatrix Feb 24, 2017
befc304
Match main and tinymce-single prototype layout. See #134.
ellatrix Feb 24, 2017
1a3319c
Reset system font for body after befc304b28d77e99b0c1196632adfafd8fe4…
ellatrix Feb 24, 2017
d0bc205
Revert "Match main and tinymce-single prototype layout. See #134."
ellatrix Feb 24, 2017
f6b1837
Address Minor Typos
Feb 27, 2017
e9f56d5
Merge pull request #139 from ahmadawais/patch-1
jasmussen Feb 27, 2017
aae86d4
Show block UI on focus, hide on type.
ellatrix Feb 27, 2017
83a729b
Merge pull request #140 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Feb 27, 2017
85ac3ca
Fix icon display of blocks
ellatrix Feb 27, 2017
58dbfd2
Merge pull request #141 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Feb 27, 2017
f7dc6e5
Clear float when object is not aligned
ellatrix Feb 27, 2017
75f5420
Bring back block border from main prototype
ellatrix Feb 27, 2017
4100064
Split block registration into files
ellatrix Feb 27, 2017
fa59b5c
Merge pull request #142 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Feb 27, 2017
2399935
Use classes for text alignment
ellatrix Feb 27, 2017
7ef9384
Replace list buttons with custom ones
ellatrix Feb 27, 2017
0e958bd
Make block.js a bit more readable and organised
ellatrix Feb 28, 2017
cb31fa1
Update heading icons as seen in mock-ups
ellatrix Feb 28, 2017
324c17d
Merge pull request #143 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Feb 28, 2017
febb32a
Remove block border on type
ellatrix Feb 28, 2017
1394a20
Merge pull request #144 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Feb 28, 2017
12c8c7c
Prevent input for non-text selections
ellatrix Feb 28, 2017
8973a8e
Merge pull request #145 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Feb 28, 2017
824aa8a
Use functions instead of commands where appropriate
ellatrix Feb 28, 2017
b1d9b8f
Merge pull request #146 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Feb 28, 2017
01f2c86
update the TinyMCE per Block prototype UI to match the Prototype UI s…
youknowriad Feb 28, 2017
5374d64
Add some more content and blocks
ellatrix Feb 28, 2017
05a8686
Restore link functionality
ellatrix Feb 28, 2017
195e130
Hide all UI on blur
ellatrix Feb 28, 2017
f8b4055
Fix webkit range.getBoundingClientRect quirk
ellatrix Feb 28, 2017
efc7d11
Per Block Prototype: Use an inline tinymce for small blocks (paragrap…
youknowriad Mar 1, 2017
1ef60a2
Update Mockups
jasmussen Mar 1, 2017
4d1902a
Merge pull request #151 from WordPress/update/mockups
jasmussen Mar 1, 2017
f602d59
Emit nodechange on left text align too
ellatrix Mar 1, 2017
7e6d178
Show link toolbar on the bottom of selection
ellatrix Mar 1, 2017
f687176
Move inline toolbar next to block toolbar
ellatrix Mar 1, 2017
2641694
Merge pull request #152 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Mar 1, 2017
662d322
Hide inline formatting toolbar along with rest of block UI
ellatrix Mar 1, 2017
d3ba08a
Merge pull request #154 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Mar 1, 2017
1110690
Adding a quote with cite block (#153)
youknowriad Mar 1, 2017
84507cb
Add image with caption block (#155)
youknowriad Mar 1, 2017
ba408b7
Remove delete button, delete block on backspace correctly
ellatrix Mar 1, 2017
88c8e70
Make sure focusnode is block before deleting whole block
ellatrix Mar 1, 2017
f8c7b89
Merge pull request #156 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Mar 1, 2017
2a68b10
Start work on inserter
ellatrix Mar 1, 2017
de05f3f
Merge pull request #157 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Mar 1, 2017
8ab6e86
Add undo levels for moving blocks
ellatrix Mar 1, 2017
617f2ed
Merge pull request #159 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Mar 1, 2017
4ed981a
Lighter UI: only leave align centre, clearer remove format icons
ellatrix Mar 1, 2017
908be1c
Merge pull request #160 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Mar 1, 2017
8567ecb
Remove block icon for now
ellatrix Mar 1, 2017
e79368f
Adjust remove formatting for list and code
ellatrix Mar 1, 2017
752ed92
Merge pull request #162 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Mar 2, 2017
99a6a58
TinyMCE Per Block: Adding the inline toolbar to TinyMCE blocks (#163)
youknowriad Mar 2, 2017
9d0826d
TinyMCE per Block: Adding the align images controls (#164)
youknowriad Mar 2, 2017
ddd20fe
Rename block registration to accommodate other registers
aduth Mar 2, 2017
ea98d15
Assign node change element to plugin scope
aduth Mar 2, 2017
6e37f05
Show all alignment options on paragraphs
aduth Mar 2, 2017
b4f462b
Implement control registration as unaware of TinyMCE
aduth Mar 2, 2017
2e9476d
Remove center alignment from headings
aduth Mar 2, 2017
86df9be
Restore heading alignment controls
aduth Mar 2, 2017
f3cb804
Rename buttons as controls
aduth Mar 2, 2017
aa03fb4
Ensure current focused node is eligible for control
aduth Mar 2, 2017
3ac955c
Add base ESLint and EditorConfig configurations
aduth Mar 2, 2017
8079400
Extend core configuration with additional rules
aduth Mar 2, 2017
9b5e6a0
Merge pull request #166 from WordPress/add/base-eslint
aduth Mar 2, 2017
0bbe313
Remove no-var ESLint rule
aduth Mar 2, 2017
b942bb4
Merge pull request #165 from WordPress/add/register-control-api
aduth Mar 2, 2017
5ebcd10
Assign element by TinyMCE selection API
aduth Mar 2, 2017
ca89f74
Merge pull request #168 from WordPress/update/single-remove-window-el…
aduth Mar 2, 2017
41039e8
Revert "Single TinyMCE: Drop window element global"
aduth Mar 2, 2017
2855d14
Merge pull request #169 from WordPress/revert-168-update/single-remov…
aduth Mar 2, 2017
278fd3e
TinyMCE per block: Handle focus as state instead of using imperative …
youknowriad Mar 2, 2017
8f3e669
TinyMCE per block: Having a more controlled output markup (#170)
youknowriad Mar 3, 2017
8ecb1e7
Allow selecting multiple block by text selection
ellatrix Mar 3, 2017
529ee55
Merge pull request #172 from WordPress/tinymce-single/mimic-ui-prototype
ellatrix Mar 3, 2017
2f13526
Remove element global in moving and unused code
ellatrix Mar 3, 2017
c763c7c
Get rid of element global
ellatrix Mar 3, 2017
83800da
TinyMCE per block: Fix the paragraph generated markup (#171)
youknowriad Mar 3, 2017
be82c89
Pass block node to onClick again
ellatrix Mar 3, 2017
d9b891c
Remove getSelectedBlock wrapper in block plugin
ellatrix Mar 3, 2017
e1ec52c
Merge pull request #173 from WordPress/remove-element-global
ellatrix Mar 3, 2017
106a2d5
TinyMCE per block: Using a simpler grammar parser (#174)
youknowriad Mar 3, 2017
8d8f04c
TinyMCE per block: Fix the Image output markup
youknowriad Mar 3, 2017
a927438
TinyMCE per block: Fix the quote markup (#175)
youknowriad Mar 3, 2017
9d1a4c1
Add styles for new tinymce link behaviour
ellatrix Mar 3, 2017
5e56f2c
Merge pull request #177 from WordPress/tinymce-link-styles
ellatrix Mar 3, 2017
2af0f47
TinyMCE per block: Adding a preview button to display the generated H…
youknowriad Mar 3, 2017
1317c19
Adding a shared sample post content
youknowriad Mar 3, 2017
3c3db50
Include simplified, diverse content types in content
aduth Mar 3, 2017
9473413
Determine cite by quote's last child text content
aduth Mar 3, 2017
af7ef8c
Merge pull request #178 from WordPress/add/shared/post-content
aduth Mar 3, 2017
f88ad8a
TinyMCE per block: Switch Text and HTML blocks making the HTML the fa…
youknowriad Mar 6, 2017
a6296f8
TinyMCE per block: Adding a simple embed block (#181)
youknowriad Mar 6, 2017
1d4c4f9
Hide block outline when block UI is hidden
ellatrix Mar 6, 2017
b36c7b8
Don't show block UI on meta key when empty
ellatrix Mar 6, 2017
30e59d4
Rely on TinyMCE to get start and end node of selection
ellatrix Mar 6, 2017
97bd72d
Merge pull request #183 from WordPress/fix/tinymce-single/block-ui
ellatrix Mar 6, 2017
4106a8a
TinyMCE per block: Adding a theme CSS to improve the preview (#182)
youknowriad Mar 6, 2017
defa286
TinyMCE per block: Adding a custom Link control to TinyMCE instances …
youknowriad Mar 6, 2017
60d9224
TinyMCE per block: Allow rich quote cites (with links ...)
youknowriad Mar 6, 2017
b838dbb
TinyMCE per block: Allow rich cites (build) (#185)
youknowriad Mar 6, 2017
b25d93d
Clean up UI creation a bit
ellatrix Mar 6, 2017
7dc6dd1
Merge pull request #186 from WordPress/add/tinymce-single/insert
ellatrix Mar 6, 2017
9ef742a
Add insert button to block outline
ellatrix Mar 6, 2017
d52b41f
Show block UI on the right for right aligned blocks
ellatrix Mar 6, 2017
1abfb44
Merge pull request #188 from WordPress/add/tinymce-single/insert
ellatrix Mar 6, 2017
7e1e0ab
Restore data-mce-selected for video overlay
ellatrix Mar 6, 2017
e4264f1
Merge pull request #189 from WordPress/fix/tinymce-single/video-overlay
ellatrix Mar 6, 2017
37c9b0a
Add getSelectedBlocks
ellatrix Mar 6, 2017
a0d7a7e
Merge pull request #191 from WordPress/fix/tinymce-single/selection
ellatrix Mar 6, 2017
dac6dc1
Try full bleed for objects
ellatrix Mar 6, 2017
368089e
Merge pull request #192 from WordPress/try/tinymce-single/full-bleed
ellatrix Mar 6, 2017
52acd1a
Fix inline toolbar with fullbleed
ellatrix Mar 6, 2017
3decf55
Merge pull request #193 from WordPress/try/tinymce-single/full-bleed
ellatrix Mar 6, 2017
7ffd75e
TinyMCE Per Block: Adding a selected block state (#194)
youknowriad Mar 7, 2017
5bcff34
TinyMCE per block: Allow block navigation using left/right arrows (#187)
youknowriad Mar 7, 2017
f993ea1
TinyMCE per block: Moving Blocks using the arrow icons (#195)
youknowriad Mar 7, 2017
853926d
Add full-bleed icon to base prototype.
jasmussen Mar 7, 2017
9a77853
Add classes.
jasmussen Mar 7, 2017
a4a07e2
Merge pull request #197 from WordPress/add/full-bleed-icon
jasmussen Mar 7, 2017
e60a2e8
TinyMCE per block: Adding the block inserter menu (#196)
youknowriad Mar 7, 2017
71c98b8
TinyMCE per block: Adding the possibility to trigger the inserter men…
youknowriad Mar 7, 2017
36dd427
Move arrows above full bleed. See #110.
ellatrix Mar 7, 2017
88f1177
Merge pull request #201 from WordPress/try/tinymce-single/full-bleed
ellatrix Mar 7, 2017
35a75d2
Move inserter on the block outline. See #72.
ellatrix Mar 7, 2017
a0bc319
Merge pull request #202 from WordPress/try/tinymce-single/full-bleed
ellatrix Mar 7, 2017
4c65e63
TinyMCE per block: Remove setTimeout when focusing programmatically (…
youknowriad Mar 8, 2017
b3df0e3
TinyMCE per block: Enhancing the embed block (#203)
youknowriad Mar 8, 2017
8de61b8
Visual polish on the prototypes.
jasmussen Mar 8, 2017
ee39782
Polish insert button.
jasmussen Mar 8, 2017
852daf1
Fix Image Controls Regresssion
youknowriad Mar 8, 2017
5f809c9
Merge pull request #205 from WordPress/update/prototype-design
jasmussen Mar 8, 2017
b548fc4
Change mce-active class to is-active.
ellatrix Mar 8, 2017
326d4d8
TinyMCE per block: Adding transform block API (#204)
youknowriad Mar 8, 2017
a7f8964
Merge pull request #206 from WordPress/update/tinymce-single/active-c…
ellatrix Mar 8, 2017
0ca1753
Normalize some of the single instance interface
jasmussen Mar 8, 2017
90f145b
TinyMCE per block: Update the toolbar style to match the UI prototype…
youknowriad Mar 8, 2017
7554910
Adjust editor padding
ellatrix Mar 8, 2017
74f9a8c
Remove global position: relative so aligned objects can be selected
ellatrix Mar 8, 2017
a4920b4
All editor text should inherit font.
ellatrix Mar 8, 2017
3499168
Adjust margins
ellatrix Mar 8, 2017
06fee9a
Add padding to blockquote
ellatrix Mar 8, 2017
be75517
Merge pull request #209 from WordPress/update/single-prototype
jasmussen Mar 8, 2017
5037e59
TinyMCE per block: Disable arrow buttons for moving blocks when nece…
youknowriad Mar 8, 2017
5af6a1c
Add inserter styles
ellatrix Mar 8, 2017
5be1763
Register element block group and create separate map
ellatrix Mar 8, 2017
e225df8
Make sure all editor text inherits the same font size
ellatrix Mar 8, 2017
833f04e
Add insert menu separators
ellatrix Mar 8, 2017
fdb5cf8
Merge pull request #211 from WordPress/add/tinymce-single/insert
ellatrix Mar 8, 2017
d5350b4
Adjust inserting for heading and paragraph
ellatrix Mar 8, 2017
8848ab3
Merge pull request #212 from WordPress/add/tinymce-single/insert
ellatrix Mar 8, 2017
56e487d
TinyMCE per block: Fix Inline inserter (#213)
youknowriad Mar 8, 2017
b02b118
TinyMCE per block: Allowing two quote styles (#216)
youknowriad Mar 9, 2017
30f90ce
TinyMCE per block: Neutral image/embed block state hides the empty ca…
youknowriad Mar 9, 2017
924af55
Allow insertion by returning string or node
ellatrix Mar 9, 2017
8ea78fe
Merge pull request #218 from WordPress/add/tinymce-single/insert
ellatrix Mar 9, 2017
4e160e0
Show UI on block insertion
ellatrix Mar 9, 2017
a5af2a1
Fix list type toggle
ellatrix Mar 9, 2017
1086f9e
Merge pull request #220 from WordPress/add/tinymce-single/insert
ellatrix Mar 9, 2017
df9e9ac
Add second quote style
ellatrix Mar 9, 2017
67d95be
Merge pull request #221 from WordPress/add/tinymce-single/quote-2
ellatrix Mar 9, 2017
f6b48ac
Try quote with cite
ellatrix Mar 9, 2017
2ab62d7
Merge pull request #222 from WordPress/add/tinymce-single/quote-2
ellatrix Mar 9, 2017
1836532
TinyMCE per block: Adding a neutral state hiding empty cites for the …
youknowriad Mar 9, 2017
87a472e
Remove blockquote should remove entire blockquote
ellatrix Mar 9, 2017
6420ddf
Merge pull request #224 from WordPress/add/tinymce-single/quote-2
ellatrix Mar 9, 2017
4cc02c5
Toggle lists to line breaks instead of paragraphs
ellatrix Mar 9, 2017
6e2e193
Merge pull request #225 from WordPress/try/tinymce-single/lists
ellatrix Mar 9, 2017
5e04872
Use contenteditable false for object blocks
ellatrix Mar 9, 2017
a5b6bf7
Merge pull request #226 from WordPress/try/tinymce-single/contentedit…
ellatrix Mar 9, 2017
5b5d0de
Clean up block UI logic
ellatrix Mar 9, 2017
6b14565
Merge pull request #227 from WordPress/try/tinymce-single/contentedit…
ellatrix Mar 9, 2017
6c9b380
Disable arrow buttons when appropriate
ellatrix Mar 10, 2017
872453f
Merge pull request #228 from WordPress/try/tinymce-single/contentedit…
ellatrix Mar 10, 2017
cef605e
Update Mockups, March 10th.
jasmussen Mar 10, 2017
0f8826c
Move figcaption button to block registration
ellatrix Mar 10, 2017
3ad341d
Merge pull request #232 from WordPress/try/tinymce-single/contentedit…
ellatrix Mar 10, 2017
a113dac
TinyMCE per block: API refactor (#230)
youknowriad Mar 10, 2017
da1825f
Use TinyMCE nightly for contenteditable false fixes
ellatrix Mar 10, 2017
5864e9b
Merge pull request #234 from WordPress/try/tinymce-single/contentedit…
ellatrix Mar 10, 2017
c7d860a
TinyMCE per block: Extract the "reducer" logic (#233)
youknowriad Mar 10, 2017
2c923e4
Remove temporary fixes
ellatrix Mar 10, 2017
f864b2e
Merge pull request #235 from WordPress/try/tinymce-single/contentedit…
ellatrix Mar 10, 2017
d04171f
Merge pull request #231 from WordPress/update/mockups
mtias Mar 10, 2017
d100ad5
Fix README linebreaks
jasmussen Mar 10, 2017
b962d79
Merge pull request #236 from WordPress/update/readme-linebreaks
jasmussen Mar 10, 2017
87b9d2f
TinyMCE per block: Fix the inserter and drop the type icon from sideb…
youknowriad Mar 10, 2017
6f04c5e
Allow blocks to register editable fields
ellatrix Mar 10, 2017
33f99c6
Merge pull request #238 from WordPress/try/tinymce-single/contentedit…
ellatrix Mar 10, 2017
11409ce
Adjust blockquote markup based on shared post content
ellatrix Mar 10, 2017
72e032b
Merge pull request #239 from WordPress/try/tinymce-single/contentedit…
ellatrix Mar 10, 2017
1e84c95
TinyMCE per block: Adjust the citation style (#240)
youknowriad Mar 10, 2017
8e7c820
Only allow inline elements within block editable fields
ellatrix Mar 10, 2017
69835ba
Merge pull request #241 from WordPress/try/tinymce-single/contentedit…
ellatrix Mar 10, 2017
6a08eb6
Restrict setting content in blockquote footer
ellatrix Mar 10, 2017
3946b5a
Merge pull request #242 from WordPress/try/tinymce-single/contentedit…
ellatrix Mar 10, 2017
4c2f7fa
Disable end_container_on_empty_block
ellatrix Mar 10, 2017
ad0a60c
Merge pull request #243 from WordPress/try/tinymce-single/contentedit…
ellatrix Mar 10, 2017
602af98
TinyMCE per block: Small tweaks (#244)
youknowriad Mar 11, 2017
a475341
Add media placeholders
ellatrix Mar 11, 2017
1608a01
Merge pull request #245 from WordPress/update/tinymce-single/mock-ups
ellatrix Mar 11, 2017
72444c7
Try drag and drop on block outline
ellatrix Mar 11, 2017
7c9069f
Merge pull request #246 from WordPress/update/tinymce-single/mock-ups
ellatrix Mar 11, 2017
fa065b4
Adjust drag element
ellatrix Mar 11, 2017
adbc2bd
Merge pull request #247 from WordPress/update/tinymce-single/mock-ups
ellatrix Mar 11, 2017
55fd713
Hovering Blocks
mimo84 Mar 12, 2017
28e0749
Border
mimo84 Mar 12, 2017
0544508
Add table block
ellatrix Mar 12, 2017
adb6b97
hoverDrag: Starting drag and drop functionality
mimo84 Mar 12, 2017
7e0ad82
hoverDrag: unused code
mimo84 Mar 13, 2017
16e5191
hoverDrag: Comments
mimo84 Mar 13, 2017
eef5170
hoverDrag: drag hover working
mimo84 Mar 13, 2017
864784e
hoverDrag: remove the dragInProgress var
mimo84 Mar 13, 2017
b72e673
hoverDrag: hide hover outline on mouseout
mimo84 Mar 13, 2017
45b91d9
hoverDrag: hide the hover outline if hovering the active block
mimo84 Mar 13, 2017
75e5e11
hoverDrag: refactor display:none code
mimo84 Mar 13, 2017
83024ee
hoverDrag: Console log removed
mimo84 Mar 13, 2017
8bc1f57
hoverDrag: not needed
mimo84 Mar 13, 2017
218178a
hoverDrag: add comments
mimo84 Mar 13, 2017
92d1cc0
hoverDrag: Hover region extends past the editor body
mimo84 Mar 13, 2017
3da7879
TinyMCE per block: Showing moving block controls on hover (#250)
youknowriad Mar 13, 2017
9649f8a
TinyMCE per block: One enter don't split the block, two enters do (#251)
youknowriad Mar 13, 2017
7d4684b
WIP: Add basic text type switcher
ellatrix Mar 13, 2017
86b561b
Merge pull request #252 from WordPress/update/tinymce-single/mock-ups
ellatrix Mar 13, 2017
7e5aa02
TinyMCE per block: Delete unnecessary abstraction (#253)
youknowriad Mar 13, 2017
66103c9
Hover style
mimo84 Mar 13, 2017
f7fd688
Merge branch 'master' into hoverDrag
mimo84 Mar 13, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions shared/tinymce/toolbar.js
Original file line number Diff line number Diff line change
@@ -75,8 +75,7 @@
function onClick( callback ) {
return function() {
editor.undoManager.transact( function() {
var element = editor.selection.getSelectedBlocks()[ 0 ];
callback( editor, element );
callback( editor, window.element );
} );
}
}
4 changes: 2 additions & 2 deletions tinymce-single/tinymce/block.js
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@

// Set focussed block. Global variable for now. Top-level node for now.

editor.on( 'nodechange', function() {
element = editor.selection.getSelectedBlocks()[ 0 ];
editor.on( 'nodechange', function( event ) {
element = window.element = event.parents[ event.parents.length - 1 ];
} );

// Global controls