Skip to content

Commit 286bc25

Browse files
committed
Merge branch 'develop'
2 parents c42900d + 2c34932 commit 286bc25

File tree

77 files changed

+13745
-25
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+13745
-25
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<a href="https://medium.com/conversational-interfaces/introducing-the-conversational-form-c3166eb2ee2f#.yq5axcfcq"><strong>Learn why we did it</strong></a>
77
</p>
88
<p align="center">
9-
<a href="https://space10-community.github.io/conversational-form/docs/0.9.70/"><strong>Explore Conversational Form docs »</strong></a>
9+
<a href="https://space10-community.github.io/conversational-form/docs/0.9.71/"><strong>Explore Conversational Form docs »</strong></a>
1010
</p>
1111
<p align="center">
1212
<img src="https://raw.githubusercontent.com/space10-community/conversational-form/master/docs/0.9.70/assets/readme-cf.gif" />
@@ -17,7 +17,7 @@
1717
Include ConversationalForm in your page:
1818

1919
```html
20-
<script type="text/javascript" src="https://cf-4053.kxcdn.com/conversational-form/0.9.70/conversational-form.min.js" crossorigin></script>
20+
<script type="text/javascript" src="https://cdn.jsdelivr.net/gh/space10-community/conversational-form@0.9.71/dist/conversational-form.min.js" crossorigin></script>
2121
```
2222
Or download the latest release:
2323
- Clone the repo: ````git clone https://github.com/space10-community/conversational-form.git````
@@ -33,7 +33,7 @@ ConversationalForm will automatically look through the DOM for a form element wi
3333

3434
[jsbin](https://jsbin.com/vopuxukaze/edit?html,js,output)
3535

36-
Read the [Getting started](https://space10-community.github.io/conversational-form/docs/0.9.70/getting-started/) page for information on the framework contents, options, templates and examples and more.
36+
Read the [Getting started](https://space10-community.github.io/conversational-form/docs/0.9.71/getting-started/) page for information on the framework contents, options, templates and examples and more.
3737

3838
## Status
3939
[![npm version](https://img.shields.io/npm/v/conversational-form.svg)](https://www.npmjs.com/package/conversational-form)
@@ -53,7 +53,7 @@ Pull Requests for bug fixes or new features are always welcome. If you choose to
5353
- Fork the "develop" branch
5454
- If you forked a while ago please get the latest changes from the "develop"-branch before submitting a Pull Request
5555
- Locally merge (or rebase) the upstream development branch into your topic branch:
56-
- ````git remote add upstream https://github.com/space10-community/conversational-form.git```
56+
- ````git remote add upstream https://github.com/space10-community/conversational-form.git````
5757
- ````git checkout develop````
5858
- ````git pull upstream````
5959
- ````git pull [--rebase] upstream develop````
@@ -65,7 +65,7 @@ See the <a href="https://github.com/space10-community/conversational-form/releas
6565

6666
## Acknowledgement
6767
Thank you to everyone who has taken part in the creation of Conversational Form.
68-
- Development by <a href="http://twitter.com/flexmotion" target="_blank">Felix Nielsen</a>
68+
- Development by <a href="http://twitter.com/flexmotion" target="_blank">Felix Nielsen</a> and <a href="https://jenssogaard.com/" target="_blank">Jens Soegaard</a> (v0.9.70+)
6969
- Design by <a href="http://www.charlieisslander.com/" target="_blank">Charlie Isslander</a> and <a href="http://norgram.co/" target="_blank">Norgram®</a>
7070
- Concept by <a href="https://space10.io" target="_blank">SPACE10</a>
7171

dist/conversational-form.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4602,16 +4602,15 @@ var cf;
46024602
};
46034603
ChatResponse.prototype.updateThumbnail = function (src) {
46044604
var thumbEl = this.el.getElementsByTagName("thumb")[0];
4605-
// Check if src is base64/url or string
4606-
if (src.indexOf("data:") === 0 || src.indexOf("http") === 0 || src.indexOf("//") === 0) {
4607-
this.image = src;
4608-
thumbEl.style.backgroundImage = 'url("' + this.image + '")';
4609-
}
4610-
else {
4605+
if (src.indexOf("text:") === 0) {
46114606
var thumbElSpan = thumbEl.getElementsByTagName("span")[0];
4612-
thumbElSpan.innerHTML = src;
4607+
thumbElSpan.innerHTML = src.split("text:")[1];
46134608
thumbElSpan.setAttribute("length", src.length.toString());
46144609
}
4610+
else {
4611+
this.image = src;
4612+
thumbEl.style.backgroundImage = 'url("' + this.image + '")';
4613+
}
46154614
};
46164615
ChatResponse.prototype.setLinkToOtherReponse = function (response) {
46174616
// link reponse to another one, keeping the update circle complete.
@@ -5382,7 +5381,7 @@ var cf;
53825381
(function (cf_1) {
53835382
var ConversationalForm = /** @class */ (function () {
53845383
function ConversationalForm(options) {
5385-
this.version = "0.9.70";
5384+
this.version = "0.9.71";
53865385
this.cdnPath = "https://cdn.jsdelivr.net/gh/space10-community/conversational-form@{version}/dist/";
53875386
this.isDevelopment = false;
53885387
this.loadExternalStyleSheet = true;

dist/conversational-form.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/0.9.71/DOM-element-attributes/index.html

Lines changed: 221 additions & 0 deletions
Large diffs are not rendered by default.

docs/0.9.71/appearance/index.html

Lines changed: 148 additions & 0 deletions
Large diffs are not rendered by default.

docs/0.9.71/assets/favicon.ico

14.7 KB
Binary file not shown.

docs/0.9.71/assets/formless.json

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
{
2+
"options": {
3+
"preventAutoAppend": true,
4+
"preventAutoFocus": true,
5+
"submitCallback": "window.onFormlessSubmited"
6+
},
7+
"tags": [
8+
{
9+
"tag": "input",
10+
"type": "text",
11+
"id": "first-tag",
12+
"value": "Prefilled value here",
13+
"cf-questions": "Prefilled1&&with follow-up1&&with follow-up11||Prefilled2&&with follow-up2&&with follow-up22"
14+
},
15+
{
16+
"tag": "select",
17+
"cf-input-placeholder": "Choose one of the above",
18+
"multiple": "multiple",
19+
"cf-questions": "Choose multiple of the elements from the list",
20+
"children":[
21+
{
22+
"tag": "option",
23+
"name": "option-dropdown-1",
24+
"cf-label": "option-1",
25+
"value": "-1"
26+
},
27+
{
28+
"tag": "option",
29+
"name": "option-dropdown-1",
30+
"cf-label": "option-2",
31+
"value": "-2"
32+
}
33+
]
34+
},
35+
{
36+
"tag": "fieldset",
37+
"type": "Radio buttons",
38+
"cf-input-placeholder": "Choose one of the above",
39+
"cf-questions": "Choose one of the radioss",
40+
"children":[
41+
{
42+
"tag": "input",
43+
"type": "radio",
44+
"name": "radio-buttons-1",
45+
"cf-label": "radio-1",
46+
"checked": "checked"
47+
},
48+
{
49+
"tag": "input",
50+
"type": "radio",
51+
"name": "radio-buttons-1",
52+
"cf-label": "radio-2"
53+
}
54+
]
55+
},
56+
{
57+
"tag": "fieldset",
58+
"type": "Checkboxes",
59+
"cf-input-placeholder": "Choose above",
60+
"cf-questions": "Choose some checkboxes",
61+
"children":[
62+
{
63+
"tag": "input",
64+
"type": "checkbox",
65+
"name": "checkboxes-buttons-1",
66+
"cf-label": "checkbox-1",
67+
"checked": "checked"
68+
},
69+
{
70+
"tag": "input",
71+
"type": "checkbox",
72+
"name": "checkboxes-buttons-1",
73+
"cf-label": "checkbox-2"
74+
}
75+
]
76+
},
77+
{
78+
"tag": "input",
79+
"type": "password",
80+
"cf-input-placeholder": "Password field",
81+
"cf-questions": "Write a password"
82+
},
83+
{
84+
"tag": "input",
85+
"type": "text",
86+
"pattern": ".{5,10}",
87+
"cf-input-placeholder": "Input w. pattern attribute",
88+
"cf-error": "No less than 5 and no more than 10 characters",
89+
"cf-questions": "Keep between 5-10 characters"
90+
},
91+
{
92+
"tag": "input",
93+
"type": "text",
94+
"required": "required",
95+
"cf-questions": "This field is required (attribute)",
96+
"cf-error": "Please write something"
97+
},
98+
{
99+
"tag": "input",
100+
"type": "text",
101+
"required": "required",
102+
"cf-questions": "This field uses window.testValidation",
103+
"cf-validation": "window.testValidation",
104+
"cf-error": "Check the window.testValidation method"
105+
}
106+
]
107+
}

docs/0.9.71/assets/logo.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)