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.

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

fix #5121: parse content in textarea as plaintext #5143

Merged
merged 2 commits into from Mar 10, 2017
Merged

fix #5121: parse content in textarea as plaintext #5143

merged 2 commits into from Mar 10, 2017

Conversation

HerringtonDarkholme
Copy link
Member

Fix #5121

@yyx990803 yyx990803 merged commit 8fca83d into vuejs:dev Mar 10, 2017
@yyx990803
Copy link
Member

👍

awamwang added a commit to awamwang/vue that referenced this pull request Mar 16, 2017
@awamwang
Merge branch 'dev' of https://github.com/vuejs/vue into dev
b63e816 
* 'dev' of https://github.com/vuejs/vue: (118 commits)
  [weex] Support unary and left open tags (vuejs#5052)
  [release] 2.2.4
  [build] 2.2.4
  fix perf measure regression for nested components of the same name (fix vuejs#5181)
  [release] 2.2.3
  [build] 2.2.3
  perf code coverage
  improve camelCase prop warning message
  warn when template contains text outside root element (vuejs#5164)
  Warn when not passing props in kebab-case (vuejs#5161)
  turn off perf timeline measuring by default + reduce its impact on dev time perf (fix vuejs#5174)
  v-bind object should have lower priority than explicit bindings (fix vuejs#5150)
  fix custom directive arg fall through (fix vuejs#5162)
  formatting tweaks
  refactor create-component
  fix wrong order of generate modifier code (vuejs#5147)
  fix v-on unit test (vuejs#5144)
  fix vuejs#5121: parse content in textarea as plaintext (vuejs#5143)
  [release] 2.2.2
  [build] 2.2.2
  ...

# Conflicts:
#	dist/vue.runtime.common.js
#	src/core/vdom/helpers/update-listeners.js
@HerringtonDarkholme HerringtonDarkholme deleted the textarea branch October 29, 2017 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kazupon kazupon kazupon approved these changes

@posva posva posva approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@HerringtonDarkholme @yyx990803 @kazupon @posva