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

Fix mixin data merging documentation #1374

Merged
merged 1 commit into from Jan 3, 2019
Merged

Fix mixin data merging documentation #1374

merged 1 commit into from Jan 3, 2019

Conversation

tombo1818
Copy link
Contributor

概要

mixinドキュメントにて、文言を修正しました。

resolve #1356

以上、よろしくお願い致します。

Copy link
Collaborator

@potato4d potato4d left a comment

Choose a reason for hiding this comment

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

よさそうですー!ありがとうございます!

@potato4d potato4d merged commit d729ae8 into vuejs:lang-ja Jan 3, 2019
syagawa pushed a commit to syagawa/jp.vuejs.org that referenced this pull request Jun 20, 2019
* Create new page

* Update

* Improve intro

* Update

* Add Example

* Include real world example and explanation about testing

* Added "Why vue" en, cn srt files into assets folder (vuejs#1367)

* added english srt file

* added chinese srt file

* typo

* fix: Correct sidebar anchor targets (vuejs#1366)

Change function execution order to correct sidebar anchor targets; more concise fix to vuejs/v2.vuejs.org#1348.

* Images not found. (vuejs#1365)

Hi,
The images link for `hn.png` and `hn-architecture.png` can be found on `../../images/`.

* [Doc EN]: `event.md` add space to new part (vuejs#1363)

* New in with + symbol

Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>

* Review of 2.5.0 doc

Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>

* Review

Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>

* Fix syntax typo

Signed-off-by: Bruno Lesieur <bruno.lesieur@gmail.com>

* Add space between new line of documentation

Signed-off-by: MachinisteWeb <bruno.lesieur@gmail.com>

* Add @posva review

Signed-off-by: MachinisteWeb <bruno.lesieur@gmail.com>

* Retrieve tweeningValue from onUpdate callback in documentation (vuejs#1350)

The tweeningValue no longer seems to be available in the tween object itself. Instead, the tweeningValue is available in the tweened object that passed as a parameter to the onUpdate callback.

* Add watch usages (vuejs#1356)

* Add watch usages!

Add `watch` usages!

* Update index.md

* tweaks to watch api examples

* Avoid updating license every year (vuejs#1353)

* Update spelling error and add some details about what we are testing

* Update

* typo for chinese subtitles of "why vue" video (vuejs#1371)

* Adding Why Vue.js video to Introduction page (vuejs#1377)

* Added video into guide introduction

* Added modal styles to page, put video line on one file, and reset iframe margin

* Fixed typo in Gulp example in deployment.md (vuejs#1376)

* Update deployment.md with Grunt example (vuejs#1375)

* Decoupled video player from Vimeo (vuejs#1374)

* Update Installation guide to use https://caniuse.com (vuejs#1372)

* [HOTFIX] initVideoModal error in common.js (vuejs#1378)

* Showing all possible params of watch() (vuejs#1380)

Surprised that the documentation didn't include the fact that the 2nd argument is the previous value. This can be really useful in some cases!

* refactor & update sponsors display

* include bronze data

* fix link

* fix link

* add build script

* update deploy docs

* Small fixes (vuejs#1381)

* fixed video modal bug in guide/index.md

* removed unnecessary sponsors content which has been in theme layout now

* fixed sponsors dropdown menu

* fixed button style in team page

* update Guillaume's core focus

* Improve based on Sarah Drasner feedback and fix some grammar

* Fixed TYPO Automatic Key Modifiers (vuejs#1388)

* update community deployment instructions

* Tweak wording of `.passive` modifier explanation

* Add guide link in Vue.filter API (vuejs#1394)

* Update filters, global filters needs to go before Vue instance creation (vuejs#1392)

Global filters defined after creating the Vue instance throws `Failed to resolve filter`. Reference https://forum.vuejs.org/t/global-filters-failing-to-resolve-inside-single-file-components/21863/6

* update tree-view example to add v-for key

* add details of object merging to mixins page

* Revise beforeUpdate API entry, fixes vuejs/vue#7481 (vuejs#1395)

* fix vue team distance sorting

* Add explicit version to download links (vuejs#1398)

* Add explicit version to download links

* improve CDN section of installation page

* demo from ’Object Change Detection‘ doesn't work (vuejs#1397)

vm.$set(this.userProfile, 'age', 27)    ==>   vm.$set(vm.userProfile, 'age', 27);

* Updated description of Weex (vuejs#1396)

* updated description of Weex (close vuejs#1382)

* Update comparison.md

* Update "incubated to" -> "incubated by"

* Update comparison.md

* Update comparison.md

* fix vue component require syntax for modern vue-loader

* The Web Optimization Project has optimized your repository! (vuejs#1389)

The Web Optimization Project optimized this repository. This commit contains the optimized files in this repository.

* Fix wrapperfind(error) typo and add example to test for whitespace

* Update

* Use factory function to save redundant logic

* Add factory function explanation and link to vue test utils guides.

* Update using codebryo feedback

* Change Github to GitHub (vuejs#1399)

* Fixed js error when click the page (vuejs#1401)

* Change cookbook entry number and reformat sentence

* Change order

* fix: typo in v-show description (vuejs#1408)

* Create new page

* Update

* Improve intro

* Update

* Add Example

* Include real world example and explanation about testing

* Update spelling error and add some details about what we are testing

* Update

* Improve based on Sarah Drasner feedback and fix some grammar

* Fix wrapperfind(error) typo and add example to test for whitespace

* Update

* Use factory function to save redundant logic

* Add factory function explanation and link to vue test utils guides.

* Update using codebryo feedback

* Change cookbook entry number and reformat sentence

* Change order

* Rebase
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Doc]: Fix mixin data merging documentation
3 participants