Skip to content

Commit 1964b76

Browse files
authored
Merge branch 'master' into add_confirmation_when_we_remove_a_message
2 parents 0a83f5c + e580d93 commit 1964b76

File tree

11 files changed

+36
-23
lines changed

11 files changed

+36
-23
lines changed

.github/stale.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Number of days of inactivity before an issue becomes stale
2-
daysUntilStale: 60
2+
daysUntilStale: 7
33
# Number of days of inactivity before a stale issue is closed
4-
daysUntilClose: 7
4+
daysUntilClose: 60
55
# Issues with these labels will never be considered stale
66
exemptLabels:
77
- pinned
88
- security
99
# Label to use when marking an issue as stale
10-
staleLabel: wontfix
10+
staleLabel: stale
1111
# Comment to post when marking an issue as stale. Set to `false` to disable
1212
markComment: >
1313
This issue has been automatically marked as stale because it has not had

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ yarn-error.log*
1919
*.njsproj
2020
*.sln
2121
*.sw?
22+
23+
# Misc
2224
.ghnpmpkgtoken
23-
build

.npmignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ export default {
177177
m.isEdited = true;
178178
m.data.text = message.data.text;
179179
}
180+
}
180181
}
181182
```
182183

@@ -204,6 +205,7 @@ For more detailed examples see the demo folder.
204205
| showConfirmationDeletion | Boolean | A bool indicating whether or not to show the confirmation text when we remove a message
205206
| showEdition | Boolean | A bool indicating whether or not to show the delete button for a message
206207
| showTypingIndicator | String | A string that can be set to a user's participant.id to show `typing` indicator for them
208+
| showHeader | Boolean | A bool indicating whether or not to show the header of chatwindow
207209
| colors | Object | An object containing the specs of the colors used to paint the component. [See here](#faq)
208210
| messageStyling | Boolean | A bool indicating whether or not to enable `msgdown` support for message formatting in chat. [See here](#faq)
209211

demo/yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2012,9 +2012,9 @@ electron-to-chromium@^1.3.413:
20122012
integrity sha512-smevlzzMNz3vMz6OLeeCq5HRWEj2AcgccNPYnAx4Usx0IOciq9DU36RJcICcS09hXoY7t7deRfVYKD14IrGb9A==
20132013

20142014
elliptic@^6.0.0, elliptic@^6.5.2:
2015-
version "6.5.2"
2016-
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
2017-
integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
2015+
version "6.5.3"
2016+
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
2017+
integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
20182018
dependencies:
20192019
bn.js "^4.4.0"
20202020
brorand "^1.0.1"
@@ -3653,9 +3653,9 @@ lodash.uniq@^4.5.0:
36533653
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
36543654

36553655
lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3:
3656-
version "4.17.15"
3657-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
3658-
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
3656+
version "4.17.19"
3657+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
3658+
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
36593659

36603660
log-symbols@^2.2.0:
36613661
version "2.2.0"

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "vue-beautiful-chat",
3-
"version": "2.4.1",
3+
"version": "2.5.0",
44
"description": "A simple and beautiful Vue chat component backend agnostic.",
5-
"main": "./src/index.js",
5+
"main": "./dist/vue-beautiful-chat.umd.min.js",
66
"repository": "https://github.com/mattmezza/vue-beautiful-chat.git",
77
"author": "Matteo Merola <mattmezza@gmail.com>",
88
"license": "MIT",
@@ -12,6 +12,9 @@
1212
"watch": "npm run build -- --watch",
1313
"prepublishOnly": "npm run build"
1414
},
15+
"files": [
16+
"dist/*"
17+
],
1518
"dependencies": {
1619
"autolinker": "^1.8.3",
1720
"emoji-js": "^3.4.0",

src/ChatWindow.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<template>
22
<div class="sc-chat-window" :class="{opened: isOpen, closed: !isOpen}">
33
<Header
4+
v-if="showHeader"
45
:show-close-button="showCloseButton"
56
:title="title"
67
:image-url="titleImageUrl"
@@ -89,6 +90,10 @@ export default {
8990
type: Boolean,
9091
default: false
9192
},
93+
showHeader: {
94+
type: Boolean,
95+
default: true
96+
},
9297
participants: {
9398
type: Array,
9499
required: true

src/Launcher.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
:show-edition="showEdition"
2929
:show-deletion="showDeletion"
3030
:show-confirmation-deletion="showConfirmationDeletion"
31+
:show-header="showHeader"
3132
:placeholder="placeholder"
3233
:show-typing-indicator="showTypingIndicator"
3334
:colors="colors"
@@ -132,6 +133,10 @@ export default {
132133
type: Boolean,
133134
default: true
134135
},
136+
showHeader: {
137+
type: Boolean,
138+
default: true
139+
},
135140
participants: {
136141
type: Array,
137142
required: true
@@ -228,7 +233,6 @@ export default {
228233
if (this.title !== '') {
229234
return this.title
230235
}
231-
232236
if (this.participants.length === 0) {
233237
return 'You'
234238
} else if (this.participants.length > 1) {

src/Message.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div class="sc-message">
2+
<div class="sc-message" :id="message.id">
33
<div
44
class="sc-message--content"
55
:class="{

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Launcher from './Launcher.vue'
22
import VTooltip from 'v-tooltip'
33

4-
const defaultComponentName = 'beautiful-chat'
4+
const defaultComponentName = 'BeautifulChat'
55

66
const Plugin = {
77
install(Vue, options = {}) {

0 commit comments

Comments
 (0)