Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/message-box' into message-box
Browse files Browse the repository at this point in the history
  • Loading branch information
wxsms committed Nov 17, 2017
2 parents 3025138 + 8704fbb commit a24d340
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/pages/components/MessageBox.md
Expand Up @@ -144,6 +144,6 @@ Name | Type | Default | Required | Description
`backdrop` | Boolean | `false` if type is alert, otherwise `true` | | Dismiss the modal by backdrop click.
`validator` | Function | | | Custom validator function for prompt. Accepts the input value as param, returns the err msg (not valid) or null (valid)

## [MessageBox.js](https://github.com/wxsms/uiv/tree/master/src/services/messagebox/MessageBox.js)
## [messageBox.js](https://github.com/wxsms/uiv/tree/master/src/services/messagebox/messageBox.js)

This file has no props.
2 changes: 1 addition & 1 deletion src/services/index.js
@@ -1 +1 @@
export {default as MessageBox} from './messagebox/MessageBox.js'
export {default as MessageBox} from './messagebox/messageBox.js'
2 changes: 1 addition & 1 deletion src/services/messagebox/MessageBox.vue
Expand Up @@ -36,7 +36,7 @@
</template>

<script>
import TYPES from './types'
import {TYPES} from './constants'
import Local from '@src/mixins/locale'
import Modal from '@src/components/modal/Modal.vue'
import Btn from '@src/components/button/Btn'
Expand Down
@@ -1,4 +1,4 @@
export default {
export const TYPES = {
ALERT: 0,
CONFIRM: 1,
PROMPT: 2
Expand Down
@@ -1,4 +1,4 @@
import TYPES from './types'
import {TYPES} from './constants'
import {removeFromDom} from '@src/utils/domUtils'
import {isFunction, isExist, isString} from '@src/utils/objectUtils'
import MessageBox from './MessageBox.vue'
Expand Down
2 changes: 1 addition & 1 deletion test/unit/specs/MessageBox.spec.js
@@ -1,6 +1,6 @@
import Vue from 'vue'
import $ from 'jquery'
import MessageBox from '@src/services/messagebox/MessageBox'
import MessageBox from '@src/services/messagebox/messageBox'
import MessageBoxDoc from '@docs/pages/components/MessageBox.md'
import utils from '../utils'

Expand Down

0 comments on commit a24d340

Please sign in to comment.