From 46cda4fbf101a5380e5c99b2a9a2613338d17a23 Mon Sep 17 00:00:00 2001
From: Ray <sympatheticfire@gmail.com>
Date: Wed, 30 Aug 2023 00:51:47 +0100
Subject: [PATCH] Fixed re-sizing fault

---
 bs4-test.html    |   4 +-
 bsdialog4.js     | 361 +++++++++++++++++++++++++----------------------
 bsdialog4.min.js |   5 +-
 3 files changed, 196 insertions(+), 174 deletions(-)

diff --git a/bs4-test.html b/bs4-test.html
index 5f1e02e..55b6ef1 100644
--- a/bs4-test.html
+++ b/bs4-test.html
@@ -200,11 +200,11 @@ BSDialog.UpdateFooter('abc123', '');
 BSDialog.UpdateSize('abc123', 'lg');
             </pre>
           </div>
-          <p><button id="button3" 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>
             $(document).ready(function(){
 
-              $("#button2").on('click', function(){
+              $("#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!');
diff --git a/bsdialog4.js b/bsdialog4.js
index bf78007..adac63e 100644
--- a/bsdialog4.js
+++ b/bsdialog4.js
@@ -1,132 +1,11 @@
 /**
  * BSDialog4
- * @version v0.1.2.046 (2023/08/20 00:39)
+ * @version v0.1.3.017 (2023/08/30 00:17)
  */
 var BSDialog = {
-	Create: async function (id, title, url, size) {
-		await this.Show({
-			ID: id,
-			Title: title,
-			Message: url,
-			URL: url,
-			Size: size,
-			Colour: "secondary"
-		});
-	},
-	Clear: function () {
-		this.body.querySelectorAll(".modal").forEach(function(e) {
-			e.parentNode.removeChild(e);
-		});
-
-		this.removeBackdrop();
-	},
-	Close: function (id) {
-		let modal = this.Find(id);
-		if (modal === null) {
-		 	return;
-		}
-
-		modal.Modal.forEach(function(e) {
-			e.parentNode.removeChild(e);
-		});
-
-		modal = this.Find(id);
-		if (modal !== null) {
-			return;
-		}
-
-		this.removeBackdrop();
-	},
-	UpdateTitle: function (id, title) {
-		let modal = this.Find(id);
-		if (modal === null) {
-		 	return;
-		}
-
-		modal.Title.forEach(function(e) {
-			e.innerHTML = title;
-		});
-	},
-	UpdateSize: function (id, size) {
-		let modal = this.Find(id);
-		if (modal === null) {
-		 	return;
-		}
-
-		modal.Modal.forEach(function(e) {
-			let modalDialog = e.querySelectorAll(".modal-dialog")[0];
-
-			modalDialog.classList.remove("modal-sm");
-			modalDialog.classList.remove("modal-md");
-			modalDialog.classList.remove("modal-lg");
-			modalDialog.classList.remove("modal-xl");
-			modalDialog.classList.add("modal-" + size);
-		});
-	},
-	UpdateBody: function (id, content) {
-		var a = this;
-
-		let modal = a.Find(id);
-		if (modal === null) {
-		 	return;
-		}
-
-		modal.Body.forEach(function(e) {
-			a.html(e, content);
-		});
-	},
-	UpdateBodyRemote: async function (id, url) {
-		var a = this;
-
-		if (!a.Exists(id)) {
-		 	return;
-		}
-
-		await fetch(url, {
-			cache: 'no-cache',
-			credentials: 'same-origin'
-		}).then(data => data.text()).then(data => {
-			a.UpdateBody(id, data);
-		}).catch((error) => {
-			a.UpdateBody(id, "Error: " + error);
-		});
-	},
-	UpdateFooter: function (id, content) {
-		var a = this;
-
-		let modal = a.Find(id);
-		if (modal === null) {
-		 	return;
-		}
-
-		modal.Footer.forEach(function(e) {
-			a.html(e, content);
-		});
-	},
-	Exists: function (id) {
-		return (this.Find(id) !== null);
-	},
-	Find: function (id) {
-		let modal = this.body.querySelectorAll("#" + this.pfx + id + ".modal");
-		if (!modal) {
-			return null;
-		}
-
-		if (modal.length <= 0) {
-			return null;
-		}
-
-		return {
-			Title: modal[0].querySelectorAll(".modal-title"),
-			Body: modal[0].querySelectorAll(".modal-body"),
-			Footer: modal[0].querySelectorAll(".modal-footer"),
-			Close: modal[0].querySelectorAll("[data-dismiss='modal']"),
-			Modal: modal
-		};
-	},
 	Show: async function (options) {
 		const a = this;
-		const _options = Object.assign(a.DefaultShowOptions, options);
+		const _options = Object.assign(a.Default().ShowOptions, options);
 
 		a.id = _options.ID;
 		a.pfx = "bsdia4_";
@@ -149,25 +28,11 @@ var BSDialog = {
 			}
 		}
 	},
-	Toast: async function (options) {
-		const a = this;
-		const _options = Object.assign(a.DefaultToastOptions, options);
-
-		await this.Show({
-			ID: _options.ID,
-			Title: _options.Title,
-			Message: _options.Message,
-			URL: null,
-			Size: _options.Size,
-			Colour: "secondary",
-			ShowFooter: false
-		});
-	},
 	Prompt: async function (options) {
 		const a = this;
 		let id = "prompt" + Math.floor(Math.random() * 10000) + 1000;
 
-		const _options = Object.assign(a.DefaultPromptOptions, options);
+		const _options = Object.assign(a.Default().PromptOptions, options);
 
 		return await new Promise((resolve, reject) => {
 
@@ -208,38 +73,152 @@ var BSDialog = {
 
 		});
 	},
-	DefaultShowOptions: {
-		ID: null,
-		Title: "",
-		Message: "",
-		URL: null,
-		Size: "md",
-		Colour: "secondary",
-		ShowFooter: true
-	},
-	DefaultToastOptions: {
-		ID: null,
-		Title: "",
-		Message: "",
-		Size: "md"
-	},
-	DefaultPromptOptions: {
-		Title: "",
-		Message: "",
-		Size: "md",
-		Buttons: [
-			{ Label: "Yes", Value: "Yes", Colour: "primary" },
-			{ Label: "No", Value: "No", Colour: "secondary" },
-			{ Label: "Cancel", Value: "Cancel", Colour: "secondary" }
-		]
-	},
-	ShowToast: function (id, title, message, size) {
-		this.Toast({
-			ID: id,
-			Title: title,
-			Message: message,
-			Size: size
+	Clear: function () {
+		this.body.querySelectorAll(".modal").forEach(function(e) {
+			e.parentNode.removeChild(e);
 		});
+
+		this.removeBackdrop();
+	},
+	Close: function (id) {
+		let modal = this.Find(id);
+		if (modal === null) {
+		 	return;
+		}
+
+		modal.Modal.forEach(function(e) {
+			e.parentNode.removeChild(e);
+		});
+
+		modal = this.Find(id);
+		if (modal !== null) {
+			return;
+		}
+
+		this.removeBackdrop();
+	},
+	Update: async function (options) {
+		const a = this;
+		let _options = Object.assign(a.Default().UpdateOptions, options);
+
+		const modal = a.Find(_options.ID);
+		if (modal === null) {
+		 	return;
+		}
+
+		if (!this.isNullOrWhitespace(_options.Title)) {
+			modal.Title.forEach(function(e) {
+				e.innerHTML = _options.Title;
+			});
+		}
+
+		if (!this.isNullOrWhitespace(_options.Body)) {
+			modal.Body.forEach(function(e) {
+				a.html(e, _options.Body);
+			});
+		}
+
+		if (!this.isNullOrWhitespace(_options.BodyURL)) {
+			if (_options.BodyURL.startsWith("http://") || _options.BodyURL.startsWith("https://") || _options.BodyURL.startsWith("/")) {
+				// ok
+			} else {
+				_options.BodyURL = null;
+			}
+		}
+
+		if (!this.isNullOrWhitespace(_options.BodyURL)) {
+			await a.UpdateBodyRemote(_options.ID, _options.BodyURL);
+		}
+
+		if (!this.isNullOrWhitespace(_options.Footer)) {
+			modal.Footer.forEach(function(e) {
+				a.html(e, _options.Footer);
+			});
+		}
+
+		if (!this.isNullOrWhitespace(_options.Size)) {
+			modal.Modal[0].querySelectorAll(".modal-dialog").forEach(function(e) {
+				e.classList.remove("modal-sm");
+				e.classList.remove("modal-md");
+				e.classList.remove("modal-lg");
+				e.classList.remove("modal-xl");
+				e.classList.add("modal-" + _options.Size);
+			});
+		}
+	},
+	UpdateBodyRemote: async function (id, url) {
+		var a = this;
+
+		if (!a.Exists(id)) {
+		 	return;
+		}
+
+		await fetch(url, {
+			cache: 'no-cache',
+			credentials: 'same-origin'
+		}).then(data => data.text()).then(data => {
+			a.UpdateBody(id, data);
+		}).catch((error) => {
+			a.UpdateBody(id, "Error: " + error);
+		});
+	},
+	Exists: function (id) {
+		return (this.Find(id) !== null);
+	},
+	Find: function (id) {
+		let modal = this.body.querySelectorAll("#" + this.pfx + id + ".modal");
+		if (!modal) {
+			return null;
+		}
+
+		if (modal.length <= 0) {
+			return null;
+		}
+
+		return {
+			Title: modal[0].querySelectorAll(".modal-title"),
+			Body: modal[0].querySelectorAll(".modal-body"),
+			Footer: modal[0].querySelectorAll(".modal-footer"),
+			Close: modal[0].querySelectorAll("[data-dismiss='modal']"),
+			Modal: modal
+		};
+	},
+	Default: function() {
+		return {
+			ShowOptions: {
+				ID: null,
+				Title: "",
+				Message: "",
+				URL: null,
+				Size: "md",
+				Colour: "secondary",
+				ShowFooter: true
+			},
+			PromptOptions: {
+				Title: "",
+				Message: "",
+				Size: "md",
+				Buttons: [
+					{ Label: "Yes", Value: "Yes", Colour: "primary" },
+					{ Label: "No", Value: "No", Colour: "secondary" },
+					{ Label: "Cancel", Value: "Cancel", Colour: "secondary" }
+				]
+			},
+			ToastOptions: {
+				ID: null,
+				Title: "",
+				Message: "",
+				Size: "md"
+			},
+			UpdateOptions: {
+				ID: null,
+				Title: null,
+				Body: null,
+				BodyURL: null,
+				Footer: null,
+				Size: null
+			}
+		};
 	},
 	addBackdrop: function () {
 		let a = this;
@@ -406,5 +385,49 @@ var BSDialog = {
 			modalDialog.classList.remove("modal-xl");
 			modalDialog.classList.add("modal-md");
 		}
+	},
+	//
+	// deprecated/legacy -support
+	// DefaultShowOptions: this.Default().ShowOptions,
+	// DefaultToastOptions: this.Default().ToastOptions,
+	// DefaultPromptOptions: this.Default().PromptOptions,
+	Create: async function (id, title, url, size) {
+		await this.Show({
+			ID: id,
+			Title: title,
+			Message: url,
+			URL: url,
+			Size: size,
+			Colour: "secondary"
+		});
+	},
+	UpdateTitle: function (id, title) {
+		this.Update({ ID: id, Title: title });
+	},
+	UpdateSize: function (id, size) {
+		this.Update({ ID: id, Size: size });
+	},
+	UpdateBody: function (id, content) {
+		this.Update({ ID: id, Body: content });
+	},
+	UpdateFooter: function (id, content) {
+		this.Update({ ID: id, Footer: content });
+	},
+	Toast: async function (options) {
+		const a = this;
+		const _options = Object.assign(a.Default().ToastOptions, options);
+
+		await this.Show({
+			ID: _options.ID,
+			Title: _options.Title,
+			Message: _options.Message,
+			URL: null,
+			Size: _options.Size,
+			Colour: "secondary",
+			ShowFooter: false
+		});
+	},
+	ShowToast: function (id, title, message, size) {
+		this.Toast({ ID: id, Title: title, Message: message, Size: size });
 	}
 };
\ No newline at end of file
diff --git a/bsdialog4.min.js b/bsdialog4.min.js
index 2f8ab3c..6917ea4 100644
--- a/bsdialog4.min.js
+++ b/bsdialog4.min.js
@@ -1,5 +1,4 @@
 /**
  * BSDialog4
- * @version v0.1.2.046 (2023/08/20 00:39)
- */
-var BSDialog={Create:async function(t,e,o,l){await this.Show({ID:t,Title:e,Message:o,URL:o,Size:l,Colour:"secondary"})},Clear:function(){this.body.querySelectorAll(".modal").forEach((function(t){t.parentNode.removeChild(t)})),this.removeBackdrop()},Close:function(t){let e=this.Find(t);null!==e&&(e.Modal.forEach((function(t){t.parentNode.removeChild(t)})),e=this.Find(t),null===e&&this.removeBackdrop())},UpdateTitle:function(t,e){let o=this.Find(t);null!==o&&o.Title.forEach((function(t){t.innerHTML=e}))},UpdateSize:function(t,e){let o=this.Find(t);null!==o&&o.Modal.forEach((function(t){let o=t.querySelectorAll(".modal-dialog")[0];o.classList.remove("modal-sm"),o.classList.remove("modal-md"),o.classList.remove("modal-lg"),o.classList.remove("modal-xl"),o.classList.add("modal-"+e)}))},UpdateBody:function(t,e){var o=this;let l=o.Find(t);null!==l&&l.Body.forEach((function(t){o.html(t,e)}))},UpdateBodyRemote:async function(t,e){var o=this;o.Exists(t)&&await fetch(e,{cache:"no-cache",credentials:"same-origin"}).then((t=>t.text())).then((e=>{o.UpdateBody(t,e)})).catch((e=>{o.UpdateBody(t,"Error: "+e)}))},UpdateFooter:function(t,e){var o=this;let l=o.Find(t);null!==l&&l.Footer.forEach((function(t){o.html(t,e)}))},Exists:function(t){return null!==this.Find(t)},Find:function(t){let e=this.body.querySelectorAll("#"+this.pfx+t+".modal");return e?e.length<=0?null:{Title:e[0].querySelectorAll(".modal-title"),Body:e[0].querySelectorAll(".modal-body"),Footer:e[0].querySelectorAll(".modal-footer"),Close:e[0].querySelectorAll("[data-dismiss='modal']"),Modal:e}:null},Show:async function(t){const e=this,o=Object.assign(e.DefaultShowOptions,t);e.id=o.ID,e.pfx="bsdia4_",e.body=document.getElementsByTagName("body")[0],e.addBackdrop(),e.addModal(o.ID,o.Title,o.Size,!0,o.Colour),null==o.URL?await e.UpdateBody(o.ID,o.Message):e.isNullOrWhitespace(o.URL)?await e.UpdateBody(o.ID,o.URL):o.URL.startsWith("http://")||o.URL.startsWith("https://")||o.URL.startsWith("/")?await e.UpdateBodyRemote(o.ID,o.URL):await e.UpdateBody(o.ID,o.URL)},Toast:async function(t){const e=Object.assign(this.DefaultToastOptions,t);await this.Show({ID:e.ID,Title:e.Title,Message:e.Message,URL:null,Size:e.Size,Colour:"secondary",ShowFooter:!1})},Prompt:async function(t){const e=this;let o="prompt"+Math.floor(1e4*Math.random())+1e3;const l=Object.assign(e.DefaultPromptOptions,t);return await new Promise(((t,a)=>{e.Create(o,l.Title,l.Message,l.Size);let s="";l.Buttons.forEach((function(t){s+='<button type="button" class="btn btn-'+t.Colour+'" data-prompt-value="'+t.Value+'">'+t.Label+"</button>"})),e.UpdateFooter(o,s);const i=e.Find(o);i.Footer[0].querySelectorAll("button").forEach((function(l){l.addEventListener("click",(function(a){a.stopPropagation(),a.preventDefault();const s=l.getAttribute("data-prompt-value");e.Close(o),t(s)}))})),i.Close.forEach((function(l){l.addEventListener("click",(function(l){l.stopPropagation(),l.preventDefault(),e.Close(o),t("")}))}))}))},DefaultShowOptions:{ID:null,Title:"",Message:"",URL:null,Size:"md",Colour:"secondary",ShowFooter:!0},DefaultToastOptions:{ID:null,Title:"",Message:"",Size:"md"},DefaultPromptOptions:{Title:"",Message:"",Size:"md",Buttons:[{Label:"Yes",Value:"Yes",Colour:"primary"},{Label:"No",Value:"No",Colour:"secondary"},{Label:"Cancel",Value:"Cancel",Colour:"secondary"}]},ShowToast:function(t,e,o,l){this.Toast({ID:t,Title:e,Message:o,Size:l})},addBackdrop:function(){let t=this;t.body.querySelectorAll(".modal-backdrop").length>0||(t.appendHtml(t.body,'<div class="modal-backdrop fade show"></div>'),t.body.classList.add("modal-open"),t.body.style.overflow="hidden",t.body.querySelectorAll(".modal-backdrop")[0].addEventListener("click",(function(e){e.stopPropagation(),e.preventDefault(),t.Clear()})))},addModal:function(t,e,o,l,a){var s=this;let i=s.Find(t);if(null!==i)return;let n="";n+='<div class="modal fade show d-block" id="'+s.pfx+t+'" tabindex="-1">',n+='  <div class="modal-dialog modal-'+o+'">',n+='    <div class="modal-content">',n+='      <div class="modal-header">',n+='        <span class="modal-title font-weight-bold">'+e+"</span>",n+='        <button type="button" class="close" data-dismiss="modal" aria-label="Close">',n+='          <span aria-hidden="true">&times;</span>',n+="        </button>",n+="      </div>",n+='      <div class="modal-body">',n+='<div class="row mt-3 pb-3">',n+='  <div class="col-12 text-center">',n+='    <div class="spinner-border" role="status">',n+='\t     <span class="sr-only">Loading...</span>',n+="    </div>",n+="  </div>",n+="</div>",n+="      </div>",!0===l&&(n+='      <div class="modal-footer">',n+='        <button type="button" class="btn btn-'+a+'" data-dismiss="modal">Close</button>',n+="      </div>"),n+="    </div>",n+="  </div>",n+="</div>",s.appendHtml(s.body,n),i=s.Find(t),null!==i&&i.Close.forEach((function(e){e.addEventListener("click",(function(e){e.stopPropagation(),e.preventDefault(),s.Close(t)})),e.addEventListener("auxclick",(function(t){t.stopPropagation(),t.preventDefault(),1===t.button&&s.toggleSize()}))}))},appendHtml:function(t,e){let o=document.createElement("template");o.innerHTML=e,o=o.content.firstChild,t.appendChild(o)},html:function(t,e){jQuery?jQuery(t).html(e):t.innerHTML=e},isNullOrWhitespace:function(t){return void 0===t||(null==t||(0==t||t.trim().length<=0))},removeBackdrop:function(){if(this.body.querySelectorAll(".modal-backdrop").length<=0)return;if(this.body.querySelectorAll(".modal").length>0)return;let t=this.body.querySelectorAll(".modal-backdrop")[0];t.parentNode.removeChild(t),this.body.classList.remove("modal-open"),this.body.style.overflow=null},toggleSize:function(){let t=this.Find(this.id);if(null===t)return;let e=t.Modal[0].querySelectorAll(".modal-dialog")[0];e.classList.contains("modal-sm")?(e.classList.remove("modal-sm"),e.classList.add("modal-md")):e.classList.contains("modal-md")?(e.classList.remove("modal-md"),e.classList.add("modal-lg")):e.classList.contains("modal-lg")?(e.classList.remove("modal-lg"),e.classList.add("modal-xl")):e.classList.contains("modal-xl")?(e.classList.remove("modal-xl"),e.classList.add("modal-sm")):(e.classList.remove("modal-sm"),e.classList.remove("modal-md"),e.classList.remove("modal-lg"),e.classList.remove("modal-xl"),e.classList.add("modal-md"))}};
\ No newline at end of file
+ * @version v0.1.3.017 (2023/08/30 00:17)
+ */
\ No newline at end of file