Compare commits

...

2 Commits

Author SHA1 Message Date
Ray
7e30e99c81 Merge pull request 'Changed test demo layout' (#9) from release/0.1.5.038 into master
Reviewed-on: #9
2023-11-18 20:15:45 +00:00
Ray
c3bddbe7c7 Changed test demo layout
Changed use of modal JS to close
2023-11-18 20:08:55 +00:00
3 changed files with 302 additions and 299 deletions

View File

@ -30,93 +30,133 @@
<body class="py-5">
<div class="container">
<div class="row mb-3">
<div class="col-6 border-right">
<div class="row mb-3 border-bottom">
<div class="col-sm-4 border-right">
<p><b>Example. Simple Text Modal</b></p>
<p>Launch a modal with a text body.</p>
<div class="pb-3 mb-3 border-bottom">
<p><b>Example. Simple Text Modal</b></p>
<p>Launch an empty modal</p>
<div class="alert alert-secondary text-sm">
<pre>
BSDialog.Show({
<p><button id="buttonL1" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
$("#buttonL1").on('click', function(){
BSDialog.Show({
ID: "modalL1",
Title: "Modal Title",
Message: "Hello Momo!",
URL: null,
Size: "md",
Colour: "secondary"
});
});
});
</script>
</div>
<div class="col-sm-8">
<div class="alert alert-secondary text-sm">
<pre>BSDialog.Show({
ID: "modalL1",
Title: "Modal Title",
Message: "Hello Momo!",
URL: null,
Size: "md",
Colour: "secondary"
});
</pre>
</div>
<p><button id="buttonL1" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
$("#buttonL1").on('click', function(){
BSDialog.Show({
ID: "modalL1",
Title: "Modal Title",
Message: "Hello Momo!",
URL: null,
Size: "md",
Colour: "secondary"
});
});
});
</script>
});</pre>
</div>
</div>
</div>
<div class="pb-3 mb-3 border-bottom">
<p><b>Example. Prompt Modal (Buttons)</b></p>
<p>Launch a prompt modal and wait for a button response</p>
<div class="alert alert-secondary text-sm">
<pre>
let response = await BSDialog.Prompt({
Title: "Modal Title",
Message: "Are you sure want to wait for a response?",
Size: "md",
Buttons: [
{ Label: "Yes", Value: "Yes", Colour: "primary" },
{ Label: "No", Value: "No", Colour: "secondary" },
{ Label: "Cancel", Value: "Cancel", Colour: "secondary" }
]
});
<div class="row mb-3 border-bottom">
<div class="col-sm-4 border-right">
alert(response);
</pre>
</div>
<p><button id="buttonL2" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
<p><b>Example. Update Modal</b></p>
<p>Make changes (title, body, size or footer) to a modal.</p>
$("#buttonL2").on('click', async function(){
let response = await BSDialog.Prompt({
Title: "Modal Title",
Message: "Are you sure want to wait for a response?",
Size: "md",
Buttons: [
{ Label: "Yes", Value: "Yes", Colour: "primary" },
{ Label: "No", Value: "No", Colour: "secondary" },
{ Label: "Cancel", Value: "Cancel", Colour: "secondary" }
]
});
<p><button id="buttonR1" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
alert(response);
$("#buttonR1").on('click', function(){
BSDialog.Show({
ID: "modalR1",
Title: "Modal Title",
Message: "Hello Momo!",
URL: null,
Size: "md",
Colour: "secondary"
});
BSDialog.Update({
ID: "modalR1",
Title: "Modal Changed Title",
Body: "Hello momo again!",
URL: null,
Size: "lg",
Footer: null
});
});
</script>
});
</script>
</div>
<div class="col-sm-8">
<div class="alert alert-secondary text-sm">
<pre>BSDialog.Update({
ID: "modalL1",
Title: "Modal Changed Title",
Body: "Hello momo again!",
URL: null,
Size: "lg",
Footer: null
});</pre>
</div>
</div>
</div>
<div class="pb-3 mb-3 border-bottom">
<p><b>Example. Multiple Modals</b></p>
<p>Launch multiple modals</p>
<div class="alert alert-secondary text-sm">
<pre>
BSDialog.Show({
<div class="row mb-3 border-bottom">
<div class="col-sm-4 border-right">
<p><b>Example. Multiple Modals (Stack)</b></p>
<p>Launch multiple modals, stacked on top of each other.</p>
<p><button id="buttonL3" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
$("#buttonL3").on('click', function(){
BSDialog.Show({
ID: "modalL3a",
Title: "Modal A Title",
Message: "First!",
URL: null,
Size: "md",
Colour: "secondary"
});
BSDialog.Show({
ID: "modalL3b",
Title: "Modal B Title",
Message: "Second!",
URL: null,
Size: "md",
Colour: "secondary"
});
});
});
</script>
</div>
<div class="col-sm-8">
<div class="alert alert-secondary text-sm">
<pre>BSDialog.Show({
ID: "modalL3a",
Title: "Modal A Title",
Message: "First!",
@ -132,47 +172,86 @@ BSDialog.Show({
URL: null,
Size: "md",
Colour: "secondary"
});
</pre>
</div>
<p><button id="buttonL3" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
});</pre>
</div>
</div>
</div>
$("#buttonL3").on('click', function(){
BSDialog.Show({
ID: "modalL3a",
Title: "Modal A Title",
Message: "First!",
URL: null,
Size: "md",
Colour: "secondary"
});
<div class="row mb-3 border-bottom">
<div class="col-sm-4 border-right">
BSDialog.Show({
ID: "modalL3b",
Title: "Modal B Title",
Message: "Second!",
URL: null,
Size: "md",
Colour: "secondary"
});
<p><b>Example. Button Prompt (Modal)</b></p>
<p>Launch a modal with a prompt of several buttons. Modal waits for a response from one of the buttons.</p>
<p><button id="buttonL2" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
$("#buttonL2").on('click', async function(){
let response = await BSDialog.Prompt({
Title: "Modal Title",
Message: "Are you sure want to wait for a response?",
Size: "md",
Buttons: [
{ Label: "Yes", Value: "Yes", Colour: "primary" },
{ Label: "No", Value: "No", Colour: "secondary" },
{ Label: "Cancel", Value: "Cancel", Colour: "secondary" }
]
});
alert(response);
});
</script>
</div>
});
</script>
</div>
<div class="col-6">
<div class="col-sm-8">
<div class="alert alert-secondary text-sm">
<pre>let response = await BSDialog.Prompt({
Title: "Modal Title",
Message: "Are you sure want to wait for a response?",
Size: "md",
Buttons: [
{ Label: "Yes", Value: "Yes", Colour: "primary" },
{ Label: "No", Value: "No", Colour: "secondary" },
{ Label: "Cancel", Value: "Cancel", Colour: "secondary" }
]
});
<div class="pb-3 mb-3 border-bottom">
<p><b>Example. Prompt Modal (Textbox)</b></p>
<p>Launch a prompt modal and wait for a textbox response</p>
<div class="alert alert-secondary text-sm">
<pre>
let response = await BSDialog.Prompt({
alert(response);</pre>
</div>
</div>
</div>
<div class="row mb-3 border-bottom">
<div class="col-sm-4 border-right">
<p><b>Example. Text Prompt (Modal)</b></p>
<p>Launch a modal with a text prompt. Modal waits for a response from the textbox.</p>
<p><button id="buttonL2a" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
$("#buttonL2a").on('click', async function(){
let response = await BSDialog.Prompt({
Type: "textbox",
Title: "Modal Title",
Message: "Are you sure want to wait for a response?",
Size: "md",
Label: "",
Placeholder: ""
});
alert(response);
});
});
</script>
</div>
<div class="col-sm-8">
<div class="alert alert-secondary text-sm">
<pre>let response = await BSDialog.Prompt({
Type: "textbox",
Title: "Modal Title",
Message: "Are you sure want to wait for a response?",
@ -181,152 +260,56 @@ let response = await BSDialog.Prompt({
Placeholder: ""
});
alert(response);
</pre>
</div>
<p><button id="buttonL2a" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
$("#buttonL2a").on('click', async function(){
let response = await BSDialog.Prompt({
Type: "textbox",
Title: "Modal Title",
Message: "Are you sure want to wait for a response?",
Size: "md",
Label: "",
Placeholder: ""
});
alert(response);
});
});
</script>
alert(response);</pre>
</div>
</div>
</div>
<div class="row mb-3 border-bottom">
<div class="col-sm-4 border-right">
<div class="pb-3 mb-3 border-bottom">
<p><b>Example. Prompt Modal (Textbox)</b></p>
<p>Launch a prompt modal and wait for a textbox response</p>
<div class="alert alert-secondary text-sm">
<pre>
let response = await BSDialog.Prompt({
Type: "textbox",
Title: "Modal Title",
Message: "Are you sure want to wait for a response?",
Size: "md",
Textbox: {
Label: "Textbox Label",
LabelSize: 4,
Placeholder: "Placeholder",
Value: "Default Value",
BoxSize: 8
}
});
alert(response);
</pre>
</div>
<p><button id="buttonL2b" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
$("#buttonL2b").on('click', async function(){
let response = await BSDialog.Prompt({
Type: "textbox",
Title: "Modal Title",
Message: "Are you sure want to wait for a response?",
Size: "md",
Textbox: {
Label: "Textbox Label",
LabelSize: 4,
Placeholder: "Placeholder",
Value: "Default Value",
BoxSize: 8
}
});
alert(response);
});
});
</script>
</div>
<div class="pb-3 mb-3 border-bottom">
<p><b>Example. Simple Text Modal</b> <span class="badge badge-warning">Deprecated</span></p>
<p>Launch an empty modal</p>
<div class="alert alert-secondary text-sm">
<pre>
BSDialog.Create('abc123', 'My Modal Box 123', 'Hello momo!', 'xl');
</pre>
</div>
<p><button id="button1" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
$("#button1").on('click', function(){
BSDialog.Create('abc123', 'My Modal Box 123', 'Hello momo!', 'xl');
});
<p><b>Example. Close Modal</b></p>
<p>Close a modal using its identifier</p>
<p><button id="buttonR2" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
$("#buttonR2").on('click', function(){
BSDialog.Close("modalR1");
});
</script>
});
</script>
</div>
<div class="col-sm-8">
<div class="alert alert-secondary text-sm">
<pre>BSDialog.Close("modalR1");</pre>
</div>
</div>
</div>
<div class="pb-3 mb-3 border-bottom">
<p><b>Example. Empty Modal and Updates.</b> <span class="badge badge-warning">Deprecated</span></p>
<p>Launch an empty modal then update its title, body, footer and size.</p>
<div class="alert alert-secondary text-sm">
<pre>
BSDialog.Create('abc123', 'My Modal Box 123', null, 'sm');
BSDialog.UpdateTitle('abc123', 'My Modal Box 567');
BSDialog.UpdateBody('abc123', 'Help, I\'m toast!');
BSDialog.UpdateFooter('abc123', '');
BSDialog.UpdateSize('abc123', 'lg');
</pre>
</div>
<p><button id="buttonR3" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
<div class="row mb-3 border-bottom">
<div class="col-sm-4 border-right">
$("#buttonR3").on('click', function(){
BSDialog.Create('abc123', 'My Modal Box 123', null, 'sm');
BSDialog.UpdateTitle('abc123', 'My Modal Box 567');
BSDialog.UpdateBody('abc123', 'Help, I\'m toast!');
BSDialog.UpdateFooter('abc123', '');
BSDialog.UpdateSize('abc123', 'lg');
});
<p><b>Example. Clear Modal</b></p>
<p>Close all modals</p>
<p><button id="buttonR3" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
$("#buttonR3").on('click', function(){
BSDialog.Clear();
});
</script>
});
</script>
</div>
<div class="col-sm-8">
<div class="alert alert-secondary text-sm">
<pre>BSDialog.Clear();</pre>
</div>
<div class="pb-3 mb-3 border-bottom">
<p><b>Example. Toast Modal.</b> <span class="badge badge-warning">Deprecated</span></p>
<p>Show a toast-style modal</p>
<div class="alert alert-secondary text-sm">
<pre>
BSDialog.ShowToast('abc123', 'My Modal Box 123', 'Help! I\'m toast.', 'sm');
</pre>
</div>
<p><button id="button6" type="button" class="btn btn-primary">Launch Modal</button></p>
<script>
$(document).ready(function(){
$("#button6").on('click', function(){
BSDialog.ShowToast('abc123', 'My Modal Box 123', 'Help! I\'m toast.', 'sm');
});
});
</script>
</div>
</div>
</div>

View File

@ -1,8 +1,7 @@
/**
* BSDialog4
* @version v0.1.5.017 (2023/11/16 17:47)
* @version v0.1.5.038 (2023/11/18 19:40)
*/
class BSDialog4 {
constructor() {
}
@ -43,7 +42,7 @@ class BSDialog4 {
ID: null,
Title: null,
Body: null,
BodyURL: null,
URL: null,
Footer: null,
Size: null
}
@ -58,6 +57,16 @@ class BSDialog4 {
return document.getElementsByTagName("body")[0];
}
get #sizeList() {
return [
"modal-sm",
"modal-md",
"modal-lg",
"modal-xl",
"modal-xxl"
];
}
async Show(options) {
const a = this;
@ -70,14 +79,10 @@ class BSDialog4 {
show: true
});
if (!a.#isNullOrWhitespace(_options.URL)) {
if (_options.URL.startsWith("http://") || _options.URL.startsWith("https://") || _options.URL.startsWith("/")) {
const response = await a.#retrieveURL(_options.URL);
if (a.#isURL(_options.URL)) {
const response = await a.#retrieveURL(_options.URL);
await a.Update({ ID: _options.ID, Body: response });
} else {
await a.Update({ ID: _options.ID, Body: _options.URL });
}
await a.Update({ ID: _options.ID, Body: response });
} else {
await a.Update({ ID: _options.ID, Body: _options.Message });
}
@ -100,29 +105,25 @@ class BSDialog4 {
Clear() {
const a = this;
a.#body.querySelectorAll(".modal").forEach(function(e) {
e.parentNode.removeChild(e);
document.querySelectorAll('.modal').forEach(function(e) {
$(e).modal('hide');
});
a.#removeBackdrop();
}
Close(id) {
const a = this;
let modal = a.Find(id);
if (modal === null) {
return;
if (id.toString().startsWith(a.#prefix)) {
id = id.toString().substr(a.#prefix.length);
}
modal.Modal.parentNode.removeChild(modal.Modal);
const node = document.getElementById(a.#prefix + id);
modal = a.Find(id);
if (modal !== null) {
return;
if (node) {
$(node).modal('hide');
node.parentNode.removeChild(node);
}
a.#removeBackdrop();
}
async Update(options) {
@ -142,40 +143,24 @@ class BSDialog4 {
a.#html(modal.Body, _options.Body);
}
if (!a.#isNullOrWhitespace(_options.BodyURL)) {
if (_options.BodyURL.startsWith("http://") || _options.BodyURL.startsWith("https://") || _options.BodyURL.startsWith("/")) {
// ok
} else {
_options.BodyURL = null;
if (!this.#isNullOrWhitespace(_options.Body)) {
a.#html(modal.Body, _options.Body);
} else {
if (this.#isURL(_options.URL)) {
const response = await a.#retrieveURL(_options.URL);
await a.Update({ ID: _options.ID, Body: response });
}
}
if (!a.#isNullOrWhitespace(_options.BodyURL)) {
const response = await a.#retrieveURL(_options.BodyURL);
await a.Update({ ID: _options.ID, Body: response });
}
if (!a.#isNullOrWhitespace(_options.Footer)) {
a.#html(modal.Footer, _options.Footer);
}
if (!a.#isNullOrWhitespace(_options.Size)) {
modal.Modal.querySelectorAll(".modal-dialog").forEach(function(e) {
e.classList.forEach(function(e2) {
if (e2 == "modal-dialog") {
return;
}
if (e2.startsWith("modal-")) {
e.classList.remove(e2);
}
});
e.classList.add("modal-" + _options.Size);
});
a.#setSize(_options.ID, "modal-" + _options.Size);
}
}
Exists(id) {
@ -467,28 +452,63 @@ class BSDialog4 {
});
}
#toggleSize(id) {
#isURL(value) {
const a = this;
let modal = a.Find(id);
if (a.#isNullOrWhitespace(value)) {
return false;
}
if (value.startsWith("http://") || value.startsWith("https://") || value.startsWith("/")) {
return true;
}
return false;
}
#setSize(id, size) {
const a = this;
const modal = a.Find(id);
if (modal === null) {
return;
}
let modalDialog = modal.Modal.querySelectorAll(".modal-dialog")[0];
if (modalDialog.classList.contains('modal-sm')) {
a.Update({ ID: id, Size: "md" });
} else if (modalDialog.classList.contains('modal-md')) {
a.Update({ ID: id, Size: "lg" });
} else if (modalDialog.classList.contains('modal-lg')) {
a.Update({ ID: id, Size: "xl" });
} else if (modalDialog.classList.contains('modal-xl')) {
a.Update({ ID: id, Size: "xxl" });
} else if (modalDialog.classList.contains('modal-xxl')) {
a.Update({ ID: id, Size: "sm" });
} else {
a.Update({ ID: id, Size: "md" });
for (let i=0; i<a.#sizeList.length; i++) {
modalDialog.classList.remove(a.#sizeList[i]);
}
modalDialog.classList.add(size);
}
#toggleSize(id) {
const a = this;
const modal = a.Find(id);
if (modal === null) {
return;
}
let modalDialog = modal.Modal.querySelectorAll(".modal-dialog")[0];
let pos = 0;
for (let i=0; i<a.#sizeList.length; i++) {
if (modalDialog.classList.contains(a.#sizeList[i])) {
modalDialog.classList.remove(a.#sizeList[i]);
pos = i;
break;
}
}
pos++;
if (pos > (a.#sizeList.length - 1)) {
pos = 0;
}
modalDialog.classList.add(a.#sizeList[pos]);
}
}

4
bsdialog4.min.js vendored

File diff suppressed because one or more lines are too long