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

Issue #5517 - css quick edit blank line number #5582

Merged
merged 2 commits into from
Oct 22, 2013
Merged

Conversation

thehogfather
Copy link
Contributor

This relates to the blank line number issue described by @njx in #5517

@ghost ghost assigned njx Oct 21, 2013
@njx
Copy link

njx commented Oct 21, 2013

This is almost certainly correct (I'm assuming the original code was a minor premature optimization :)), though I think we can no longer easily get into the case where this was broken before because of the recent change to make it so that a given rule is only shown once. I bet you could still get into it if you happen to have two different CSS files that have matching rules on the same line number, though.

In any case, this seems fine to merge, except that it needs to be merged with master due to conflicts. Would you mind doing that?

Conflicts:
	src/editor/InlineTextEditor.js
@thehogfather
Copy link
Contributor Author

Done.

@njx
Copy link

njx commented Oct 22, 2013

Thanks! Merging.

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.

2 participants