Merge branch 'master' of github.com:OnsenUI/react-onsenui

OnsenUI · Oct 26, 2016 · 0b91d2a · 0b91d2a
2 parents 1235ced + e829903
commit 0b91d2a
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/components/Modal.jsx b/src/components/Modal.jsx
@@ -76,12 +76,11 @@ class Modal extends BasicComponent {
 
 Modal.propTypes = {
   /**
-   * @property animation
+   * @name animation
    * @type {String}
    * @description
    *   [en]
-   *     Animation name. Available animations are `"slide"`, `"lift"`, `"fade"` and `"none"`.
-   *     These are platform based animations. For fixed animations, add `"-ios"` or `"-md"` suffix to the animation name. E.g. `"lift-ios"`, `"lift-md"`. Defaults values are `"slide-ios"` and `"fade-md"`.
+   *     Animation name. Available animations are `"fade"` and `"none"`.
    *   [/en]
    */
   animation: React.PropTypes.oneOf(['none', 'fade']),