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

Rewrite some logic in getTagInfo and getTagAttributes apis for CodeMirror updates in xml mode. #7545

Merged
merged 4 commits into from
Apr 17, 2014

Conversation

RaymondLim
Copy link
Contributor

No description provided.

}

// If the ctx is inside the tag name of an end tag, innerModeData.state.tagName is
// undefined. So return token string as the tag name when the ctx is in an end tag.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"when the ctx is in an end tag" at the end of this comment is redundant, so it should be removed to simplify comment.

@redmunds
Copy link
Contributor

Done with initial review.

@RaymondLim
Copy link
Contributor Author

@redmunds Changes are pushed. Ready for re-review.

@redmunds
Copy link
Contributor

@RaymondLim There are merge conflicts, so you'll need to resolve those.

Also, does this fix a particular bug?

@RaymondLim
Copy link
Contributor Author

I'll try to resolve the conflict on my win 7 using the above command line tips.

And yes, this also fixes #7541.

@RaymondLim
Copy link
Contributor Author

@redmunds Done resolving the conflict in CodeMirror submodule.

@redmunds
Copy link
Contributor

Merging.

redmunds added a commit that referenced this pull request Apr 17, 2014
Rewrite some logic in getTagInfo and getTagAttributes apis for CodeMirror updates in xml mode.
@redmunds redmunds merged commit ea16d5c into master Apr 17, 2014
@redmunds redmunds deleted the rlim/update-codemirror branch April 17, 2014 01:49
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