Compare commits

...

7 Commits

Author SHA1 Message Date
Ray
d4bec5b9d4 Merge pull request 'Added movable support' (#11) from release/0.1.7.022 into master
Reviewed-on: #11
2024-01-21 18:57:41 +00:00
Ray
462f69f221 Added movable support 2024-01-21 15:30:00 +00:00
Ray
57b8a3ce0b Merge pull request 'Added Pop() to close top-most modal' (#10) from release/0.1.6.015 into master
Reviewed-on: #10
2024-01-20 23:23:57 +00:00
Ray
ecd6dd156d Added Pop() to close top-most modal
Fixed stacking modal causes scrolling and focus failure
2023-12-08 22:19:39 +00:00
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
Ray
7d4057fdbc Merge pull request 'Refactor to JS class' (#8) from release/0.1.5.017 into master
Reviewed-on: #8
2023-11-16 22:06:49 +00:00
3 changed files with 397 additions and 367 deletions

View File

@ -30,25 +30,13 @@
<body class="py-5"> <body class="py-5">
<div class="container"> <div class="container">
<div class="row mb-3"> <div class="row mb-3 border-bottom">
<div class="col-6 border-right"> <div class="col-sm-4 border-right">
<div class="pb-3 mb-3 border-bottom">
<p><b>Example. Simple Text Modal</b></p> <p><b>Example. Simple Text Modal</b></p>
<p>Launch an empty modal</p> <p>Launch a modal with a text body.</p>
<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> <p><button id="buttonL1" type="button" class="btn btn-primary">Launch Modal</button></p>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
@ -65,76 +53,79 @@ BSDialog.Show({
}); });
</script> </script>
</div> </div>
<div class="col-sm-8">
<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"> <div class="alert alert-secondary text-sm">
<pre> <pre>BSDialog.Show({
let response = await BSDialog.Prompt({ ID: "modalL1",
Title: "Modal Title", Title: "Modal Title",
Message: "Are you sure want to wait for a response?", Message: "Hello Momo!",
URL: null,
Size: "md", Size: "md",
Buttons: [ Colour: "secondary"
{ Label: "Yes", Value: "Yes", Colour: "primary" }, });</pre>
{ Label: "No", Value: "No", Colour: "secondary" },
{ Label: "Cancel", Value: "Cancel", Colour: "secondary" }
]
});
alert(response);
</pre>
</div> </div>
<p><button id="buttonL2" type="button" class="btn btn-primary">Launch Modal</button></p>
</div>
</div>
<div class="row mb-3 border-bottom">
<div class="col-sm-4 border-right">
<p><b>Example. Update Modal</b></p>
<p>Make changes (title, body, size or footer) to a modal.</p>
<p><button id="buttonR1" type="button" class="btn btn-primary">Launch Modal</button></p>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$("#buttonL2").on('click', async function(){ $("#buttonR1").on('click', function(){
let response = await BSDialog.Prompt({ BSDialog.Show({
ID: "modalR1",
Title: "Modal Title", Title: "Modal Title",
Message: "Are you sure want to wait for a response?", Message: "Hello Momo!",
URL: null,
Size: "md", Size: "md",
Buttons: [ Colour: "secondary"
{ Label: "Yes", Value: "Yes", Colour: "primary" },
{ Label: "No", Value: "No", Colour: "secondary" },
{ Label: "Cancel", Value: "Cancel", Colour: "secondary" }
]
}); });
alert(response); BSDialog.Update({
ID: "modalR1",
Title: "Modal Changed Title",
Body: "Hello momo again!",
URL: null,
Size: "lg",
Footer: null
});
}); });
}); });
</script> </script>
</div> </div>
<div class="col-sm-8">
<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"> <div class="alert alert-secondary text-sm">
<pre> <pre>BSDialog.Update({
BSDialog.Show({ ID: "modalL1",
ID: "modalL3a", Title: "Modal Changed Title",
Title: "Modal A Title", Body: "Hello momo again!",
Message: "First!",
URL: null, URL: null,
Size: "md", Size: "lg",
Colour: "secondary" Footer: null
}); });</pre>
BSDialog.Show({
ID: "modalL3b",
Title: "Modal B Title",
Message: "Second!",
URL: null,
Size: "md",
Colour: "secondary"
});
</pre>
</div> </div>
</div>
</div>
<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> <p><button id="buttonL3" type="button" class="btn btn-primary">Launch Modal</button></p>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
@ -161,29 +152,83 @@ BSDialog.Show({
}); });
</script> </script>
</div>
</div> </div>
<div class="col-6"> <div class="col-sm-8">
<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"> <div class="alert alert-secondary text-sm">
<pre> <pre>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"
});</pre>
</div>
</div>
</div>
<div class="row mb-3 border-bottom">
<div class="col-sm-4 border-right">
<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({ let response = await BSDialog.Prompt({
Type: "textbox",
Title: "Modal Title", Title: "Modal Title",
Message: "Are you sure want to wait for a response?", Message: "Are you sure want to wait for a response?",
Size: "md", Size: "md",
Label: "", Buttons: [
Placeholder: "" { Label: "Yes", Value: "Yes", Colour: "primary" },
{ Label: "No", Value: "No", Colour: "secondary" },
{ Label: "Cancel", Value: "Cancel", Colour: "secondary" }
]
}); });
alert(response); alert(response);
</pre> });
});
</script>
</div> </div>
<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" }
]
});
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> <p><button id="buttonL2a" type="button" class="btn btn-primary">Launch Modal</button></p>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
@ -204,129 +249,67 @@ alert(response);
}); });
</script> </script>
</div> </div>
<div class="col-sm-8">
<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"> <div class="alert alert-secondary text-sm">
<pre> <pre>let response = await BSDialog.Prompt({
let response = await BSDialog.Prompt({
Type: "textbox", Type: "textbox",
Title: "Modal Title", Title: "Modal Title",
Message: "Are you sure want to wait for a response?", Message: "Are you sure want to wait for a response?",
Size: "md", Size: "md",
Textbox: { Label: "",
Label: "Textbox Label", Placeholder: ""
LabelSize: 4,
Placeholder: "Placeholder",
Value: "Default Value",
BoxSize: 8
}
}); });
alert(response); alert(response);</pre>
</pre>
</div> </div>
<p><button id="buttonL2b" type="button" class="btn btn-primary">Launch Modal</button></p> </div>
</div>
<div class="row mb-3 border-bottom">
<div class="col-sm-4 border-right">
<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> <script>
$(document).ready(function(){ $(document).ready(function(){
$("#buttonL2b").on('click', async function(){ $("#buttonR2").on('click', function(){
let response = await BSDialog.Prompt({ BSDialog.Close("modalR1");
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> </script>
</div> </div>
<div class="col-sm-8">
<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"> <div class="alert alert-secondary text-sm">
<pre> <pre>BSDialog.Close("modalR1");</pre>
BSDialog.Create('abc123', 'My Modal Box 123', 'Hello momo!', 'xl'); </div>
</pre>
</div> </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');
});
});
</script>
</div> </div>
<div class="pb-3 mb-3 border-bottom"> <div class="row mb-3 border-bottom">
<p><b>Example. Empty Modal and Updates.</b> <span class="badge badge-warning">Deprecated</span></p> <div class="col-sm-4 border-right">
<p>Launch an empty modal then update its title, body, footer and size.</p>
<div class="alert alert-secondary text-sm"> <p><b>Example. Clear Modal</b></p>
<pre> <p>Close all modals</p>
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> <p><button id="buttonR3" type="button" class="btn btn-primary">Launch Modal</button></p>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$("#buttonR3").on('click', function(){ $("#buttonR3").on('click', function(){
BSDialog.Create('abc123', 'My Modal Box 123', null, 'sm'); BSDialog.Clear();
BSDialog.UpdateTitle('abc123', 'My Modal Box 567');
BSDialog.UpdateBody('abc123', 'Help, I\'m toast!');
BSDialog.UpdateFooter('abc123', '');
BSDialog.UpdateSize('abc123', 'lg');
}); });
}); });
</script> </script>
</div> </div>
<div class="col-sm-8">
<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"> <div class="alert alert-secondary text-sm">
<pre> <pre>BSDialog.Clear();</pre>
BSDialog.ShowToast('abc123', 'My Modal Box 123', 'Help! I\'m toast.', 'sm');
</pre>
</div> </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>
</div> </div>

View File

@ -1,16 +1,33 @@
/** /**
* BSDialog4 * BSDialog4
* @version v0.1.5.017 (2023/11/16 17:47) * @version v0.1.7.022 (2024/01/21 03:40)
*/ */
class BSDialog4 { class BSDialog4 {
constructor() { constructor() {
} }
get #prefix() {
return "bsdia4_";
}
get Options() { get #body() {
return { return document.getElementsByTagName("body")[0];
ShowModal: { }
get #sizeList() {
return [
"modal-sm",
"modal-md",
"modal-lg",
"modal-xl",
"modal-xxl"
];
}
async Show(options) {
const a = this;
const _options = Object.assign({
ID: null, ID: null,
Title: "", Title: "",
Message: "", Message: "",
@ -18,14 +35,36 @@ class BSDialog4 {
Size: "md", Size: "md",
Colour: "secondary", Colour: "secondary",
ShowFooter: true, ShowFooter: true,
EasyClose: true EasyClose: true,
}, IsMovable: true
ShowPrompt: { }, options);
a.addModal(_options.ID, _options.Title, _options.Size, _options.ShowFooter, _options.IsMovable, _options.Colour);
$("#" + a.#prefix + _options.ID).modal({
backdrop: _options.EasyClose,
show: true
});
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.Message });
}
}
async Prompt(options) {
const a = this;
const id = Math.floor(Math.random() * 10000) + 1000;
const _options = Object.assign({
Type: "button", Type: "button",
Title: "", Title: "",
Message: "", Message: "",
Size: "md", Size: "md",
EasyClose: true, EasyClose: true,
IsMovable: true,
Buttons: [ Buttons: [
{ Label: "Yes", Value: "Yes", Colour: "primary" }, { Label: "Yes", Value: "Yes", Colour: "primary" },
{ Label: "No", Value: "No", Colour: "secondary" }, { Label: "No", Value: "No", Colour: "secondary" },
@ -38,55 +77,7 @@ class BSDialog4 {
Value: "", Value: "",
BoxSize: 8 BoxSize: 8
} }
}, }, options);
UpdateModal: {
ID: null,
Title: null,
Body: null,
BodyURL: null,
Footer: null,
Size: null
}
}
}
get #prefix() {
return "bsdia4_";
}
get #body() {
return document.getElementsByTagName("body")[0];
}
async Show(options) {
const a = this;
const _options = Object.assign(a.Options.ShowModal, options);
a.addModal(_options.ID, _options.Title, _options.Size, _options.ShowFooter, _options.Colour);
$("#" + a.#prefix + _options.ID).modal({
backdrop: _options.EasyClose,
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);
await a.Update({ ID: _options.ID, Body: response });
} else {
await a.Update({ ID: _options.ID, Body: _options.URL });
}
} else {
await a.Update({ ID: _options.ID, Body: _options.Message });
}
}
async Prompt(options) {
const a = this;
const id = Math.floor(Math.random() * 10000) + 1000;
const _options = Object.assign(a.Options.ShowPrompt, options);
switch (_options.Type) { switch (_options.Type) {
case "textbox": case "textbox":
@ -97,37 +88,58 @@ class BSDialog4 {
} }
} }
Clear() { async Clear() {
const a = this; const a = this;
a.#body.querySelectorAll(".modal").forEach(function(e) { document.querySelectorAll('.modal').forEach(async function(e) {
e.parentNode.removeChild(e); await a.Close(e.getAttribute("id"));
}); });
a.#removeBackdrop();
} }
Close(id) { async Close(id) {
const a = this; const a = this;
let modal = a.Find(id); if (id.toString().startsWith(a.#prefix)) {
if (modal === null) { id = id.toString().substr(a.#prefix.length);
return;
} }
modal.Modal.parentNode.removeChild(modal.Modal); const node = document.getElementById(a.#prefix + id);
modal = a.Find(id); if (node) {
if (modal !== null) { await $(node).modal('hide');
return;
node.parentNode.removeChild(node);
} }
a.#removeBackdrop(); if (document.querySelectorAll('.modal').length > 0) {
if (!a.#body.classList.contains("modal-open")) {
a.#body.classList.add("modal-open");
a.#body.style.paddingRight = "17px";
}
}
}
async Pop() {
const a = this;
if (document.querySelectorAll('.modal').length > 0) {
const id = document.querySelectorAll('.modal')[0].getAttribute("id");
await a.Close(id);
}
} }
async Update(options) { async Update(options) {
const a = this; const a = this;
let _options = Object.assign(a.Options.UpdateModal, options); const _options = Object.assign({
ID: null,
Title: null,
Body: null,
URL: null,
Footer: null,
Size: null
}, options);
const modal = a.Find(_options.ID); const modal = a.Find(_options.ID);
if (modal === null) { if (modal === null) {
@ -142,40 +154,24 @@ class BSDialog4 {
a.#html(modal.Body, _options.Body); a.#html(modal.Body, _options.Body);
} }
if (!a.#isNullOrWhitespace(_options.BodyURL)) { if (!this.#isNullOrWhitespace(_options.Body)) {
if (_options.BodyURL.startsWith("http://") || _options.BodyURL.startsWith("https://") || _options.BodyURL.startsWith("/")) { a.#html(modal.Body, _options.Body);
// ok
} else { } else {
_options.BodyURL = null; if (this.#isURL(_options.URL)) {
} const response = await a.#retrieveURL(_options.URL);
}
if (!a.#isNullOrWhitespace(_options.BodyURL)) {
const response = await a.#retrieveURL(_options.BodyURL);
await a.Update({ ID: _options.ID, Body: response }); await a.Update({ ID: _options.ID, Body: response });
} }
}
if (!a.#isNullOrWhitespace(_options.Footer)) { if (!a.#isNullOrWhitespace(_options.Footer)) {
a.#html(modal.Footer, _options.Footer); a.#html(modal.Footer, _options.Footer);
} }
if (!a.#isNullOrWhitespace(_options.Size)) { if (!a.#isNullOrWhitespace(_options.Size)) {
modal.Modal.querySelectorAll(".modal-dialog").forEach(function(e) { a.#setSize(_options.ID, "modal-" + _options.Size);
e.classList.forEach(function(e2) {
if (e2 == "modal-dialog") {
return;
} }
if (e2.startsWith("modal-")) {
e.classList.remove(e2);
}
});
e.classList.add("modal-" + _options.Size);
});
}
} }
Exists(id) { Exists(id) {
@ -207,7 +203,7 @@ class BSDialog4 {
} }
addModal(id, title, size, showFooter, closeColour) { addModal(id, title, size, showFooter, isMovable, closeColour) {
const a = this; const a = this;
// don't allow duplicates // don't allow duplicates
@ -266,6 +262,42 @@ class BSDialog4 {
a.#toggleSize(id); a.#toggleSize(id);
}); });
if (isMovable) {
const panel = modal.Modal.querySelectorAll(".modal-dialog")[0];
let isMovable = false;
let currentPos = { X: 0, Y: 0 };
let movePos = { X: 0, Y: 0 };
modal.Title.addEventListener("mousedown", function(e) {
if ((e.buttons == 1) && !isMovable) {
movePos = { X: e.clientX, Y: e.clientY };
currentPos = {
X: (a.#isNullOrWhitespace(panel.style.left) ? 0 : parseInt(panel.style.left.replace("px", ""))),
Y: (a.#isNullOrWhitespace(panel.style.top) ? 0 : parseInt(panel.style.top.replace("px", "")))
};
isMovable = true;
modal.Title.style.cursor = "move";
e.preventDefault();
}
});
document.addEventListener("mouseup", function(e) {
if (isMovable) {
isMovable = false;
modal.Title.style.cursor = "default";
}
});
document.addEventListener("mousemove", function(e) {
if ((e.buttons == 1) && isMovable) {
panel.style.left = ((e.clientX - movePos.X) + currentPos.X) + 'px';
panel.style.top = ((e.clientY - movePos.Y) + currentPos.Y) + 'px';
}
});
}
} }
async #showButtonPrompt(id, options) { async #showButtonPrompt(id, options) {
@ -434,26 +466,6 @@ class BSDialog4 {
return (e.trim().length <= 0); return (e.trim().length <= 0);
} }
#removeBackdrop() {
const a = this;
if (a.#body.querySelectorAll(".modal-backdrop").length <= 0) {
return;
}
if (a.#body.querySelectorAll(".modal").length > 0) {
return;
}
a.#body.querySelectorAll(".modal-backdrop").forEach(function(e){
e.parentNode.removeChild(e);
});
// unlock background
a.#body.classList.remove("modal-open");
a.#body.style.overflow = null;
}
async #retrieveURL(url) { async #retrieveURL(url) {
return await new Promise(async (resolve) => { return await new Promise(async (resolve) => {
await fetch(url, { await fetch(url, {
@ -467,28 +479,63 @@ class BSDialog4 {
}); });
} }
#toggleSize(id) { #isURL(value) {
const a = this; 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) { if (modal === null) {
return; return;
} }
let modalDialog = modal.Modal.querySelectorAll(".modal-dialog")[0]; let modalDialog = modal.Modal.querySelectorAll(".modal-dialog")[0];
if (modalDialog.classList.contains('modal-sm')) {
a.Update({ ID: id, Size: "md" }); for (let i=0; i<a.#sizeList.length; i++) {
} else if (modalDialog.classList.contains('modal-md')) { modalDialog.classList.remove(a.#sizeList[i]);
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" });
} }
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