Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Merge cmv3 into master #2853

Merged
merged 188 commits into from
Feb 13, 2013
Merged

Merge cmv3 into master #2853

merged 188 commits into from
Feb 13, 2013

Conversation

njx
Copy link

@njx njx commented Feb 13, 2013

@gruehle

DON'T TASE ME BRO

Narciso Jaramillo and others added 30 commits October 29, 2012 18:46
- changed events on Editor to use new CodeMirror event mechanism instead of setOption()
- changed getScrollerElement() to getRootElement() for managing height
- changed delCharLeft()/delCharRight() to delCharBefore()/delCharAfter()
- changed various CodeMirror style classes whose names have changed
- commented out some unimplemented methods
- updated CodeMirror SHA
- update inline editors to use new addLineWidget() API
- use markText() for line hiding
- refresh host editor after adding an inline widget so CodeMirror updates its line heights properly
- make rule list appear in front of code in inline widget
[cmv3] do not hide lines when the range is zero
* Don't try to hide any lines if the range to hide is empty.
* Set inclusiveLeft/inclusiveRight when marking text to be hidden so the first/last lines
  are included.
* If focus is in an inline widget before a refresh, restore focus afterward.
* Call _removeInlineWidgetInternal() when we remove a widget since we no longer get called
  back in this case.
* Fix up unit test hidden line verification to work with new v3 API.

Note that there are still three failing unit tests in InlineEditorProviders-test. Two of
them are related to inline widget sizing, which will be addressed in a future user story.
The third will be fixed by a bugfix that we're submitting upstream:
https://github.com/njx/CodeMirror/compare/widget-focus
…nd ensure cursor within inline widget remains visible on selection change
[cmv3] Ensure inline widgets are scrolled to be fully visible when opened, and ...
Properly clip rule list to status bar
gruehle and others added 25 commits February 7, 2013 17:34
For #2780, ensure that the cursor doesn't interfere with mouse events
Specify edit origin for color editor widgets in order to batch undos
Update HTML code hints unit test since we're now filtering already used attributes.
…n type but actually either inside an attribute value or after an empty attribute value.

Also add three more extension unit tests to verify the new code.
For #2806, refresh child editor on timeout after redraw event
…emporary cherry-pick of a fix from upstream and avoids other fixes we don't want yet.
Adjust rules on when to refresh Editor, to fix bugs
njx pushed a commit that referenced this pull request Feb 13, 2013
Merge cmv3 into master
@njx njx merged commit 40a6275 into master Feb 13, 2013
@njx njx deleted the cmv3 branch January 15, 2014 22:02
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants