From 18586d08e2e36aba5155b441f520756d7dea5b8f Mon Sep 17 00:00:00 2001
From: Lewis Goddard <lewisgoddard@eustasy.org>
Date: Thu, 15 Feb 2018 00:24:45 +0000
Subject: [PATCH 1/2] Fix #14 : Move styles to block

---
 index.html               | 14 ++++----
 jQuery.leanModal2.js     | 76 +++++++++++++++++++++++++++-------------
 jQuery.leanModal2.min.js |  4 +--
 3 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/index.html b/index.html
index dbedd3d..45a2dba 100644
--- a/index.html
+++ b/index.html
@@ -45,11 +45,13 @@ <h1>jQuery.leanModal2</h1>
 			<section class="whole smablet-half equalize">
 				<h2>Defaults</h2>
 				<textarea class="code rounded" readonly>$('.leanmodal').leanModal({
-	overlayOpacity: 0.7,
+	defaultStyles: true, // GLOBAL
+	fadeTime: 200, // GLOBAL
+	overlayOpacity: 0.7, // GLOBAL
 	closeButton: '.js-leanmodal-close',
 	disableCloseOnOverlayClick: false,
 	disableCloseOnEscape: false,
-	fadeTime: 200,
+	modalCenter: true,
 });</textarea>
 				<h3 class="button clickable rounded leanmodal-defaults" data-modal-id="#defaults-example">Default Example</h3>
 			</section>
@@ -57,11 +59,13 @@ <h3 class="button clickable rounded leanmodal-defaults" data-modal-id="#defaults
 			<section class="whole smablet-half equalize">
 				<h2>Modified</h2>
 				<textarea class="code rounded" readonly>$('.leanmodal').leanModal({
-	overlayOpacity: 0.3,
+	defaultStyles: true, // GLOBAL
+	fadeTime: 200, // GLOBAL
+	overlayOpacity: 0.7, // GLOBAL
 	closeButton: '.close-it',
 	disableCloseOnOverlayClick: true,
 	disableCloseOnEscape: true,
-	fadeTime: 0,
+	modalCenter: true,
 });</textarea>
 				<h3 class="button clickable rounded leanmodal-modified" data-modal-id="#modified-example">Modified Example</h3>
 			</section>
@@ -90,11 +94,9 @@ <h3>Hello!</h3>
 
 		<script>
 			$('.leanmodal-modified').leanModal({
-				overlayOpacity: 0.3,
 				closeButton: '.close-it',
 				disableCloseOnOverlayClick: true,
 				disableCloseOnEscape: true,
-				fadeTime: 0,
 			});
 		</script>
 
diff --git a/jQuery.leanModal2.js b/jQuery.leanModal2.js
index 3c6e14a..aaad640 100644
--- a/jQuery.leanModal2.js
+++ b/jQuery.leanModal2.js
@@ -1,4 +1,4 @@
-////	jQuery.leanModal2.js v2.6.2
+////	jQuery.leanModal2.js v2.6.3
 // MIT Licensed by eustasy https://eustasy.org
 // Based on leanModal v1.1 by Ray Stone - http://finelysliced.com.au
 
@@ -16,25 +16,67 @@
 			////	Default Options
 			// Set some Defaults.
 			var defaults = {
-				overlayOpacity: 0.7,
+				defaultStyles: true, // GLOBAL
+				fadeTime: 200, // GLOBAL
+				overlayOpacity: 0.7, // GLOBAL
 				closeButton: '.js-leanmodal-close',
 				disableCloseOnOverlayClick: false,
 				disableCloseOnEscape: false,
-				fadeTime: 200,
 				modalCenter: true,
 			}
 			// Merge in any passed options.
 			options = $.extend(defaults, options)
 
+			//// Default styles
+			if ( options.defaultStyles ) {
+				if ( $('#js-leanmodal-styles').length == 0 ) {
+					$('<style>')
+						.prop('type', 'text/css')
+						.prop('id', 'js-leanmodal-styles')
+						.html('\
+							@keyframes smoothFadeOut {\
+								from { opacity: 1; }\
+								to { opacity: 0; }\
+							}\
+							@keyframes smoothFadeIn {\
+								from { opacity: 0; }\
+								to { opacity: 1; }\
+							}\
+							#js-leanmodal-overlay {\
+								align-items: center;\
+								background: rgba(0, 0, 0, ' + options.overlayOpacity + ');\
+								display: none;\
+								height: 100%;\
+								justify-content: center;\
+								left: 0;\
+								position: fixed;\
+								top: 0;\
+								width: 100%;\
+							}\
+							.js-leanmodal-inactive {\
+								animation: smoothFadeOut ' + options.fadeTime + 'ms ease-in-out both;\
+							}\
+							.js-leanmodal-active {\
+								animation: smoothFadeIn ' + options.fadeTime + 'ms ease-in-out both;\
+								display: block;\
+								z-index: 1000\
+							}\
+							#js-leanmodal-overlay.js-leanmodal-active {\
+								display: flex;\
+								z-index: 100;\
+							}'
+						).appendTo('head')
+				}
+			}
+
 			////	Close the Modal
 			// FUNCTION: Fade out the overlay and a passed identifier.
 			function leanModal_Close(modal_id) {
-				$('#js-leanmodal-overlay').fadeOut(options.fadeTime)
-				$(modal_id).fadeOut(options.fadeTime)
+				$('#js-leanmodal-overlay').removeClass('js-leanmodal-active').addClass('js-leanmodal-inactive')
+				$(modal_id).removeClass('js-leanmodal-active').addClass('js-leanmodal-inactive')
 				$('#js-leanmodal-overlay').unbind('click')
 				$(document).off('keyup')
 				$(modal_id).appendTo('body')
-				$('#js-leanmodal-overlay').remove()
 			}
 
 			////	Everything is Linked
@@ -85,12 +127,7 @@
 					////	There can be only one.
 					// Overlay. If there isn't an overlay, add one.
 					if ( $('#js-leanmodal-overlay').length == 0 ) {
-						var style =
-						    'background: rgba(0, 0, 0, ' +
-						    options.overlayOpacity +
-						    '); display: none; height: 100%; left: 0; position: fixed; top: 0; width: 100%; z-index: 100; ' +
-						    'align-items: center; justify-content: center;'
-						var overlay = $('<div id="js-leanmodal-overlay" style="' + style + '"></div>')
+						var overlay = $('<div id="js-leanmodal-overlay"></div>')
 						$('body').append(overlay)
 					}
 
@@ -106,24 +143,15 @@
 					}
 
 					////	Modal Positioning
-					// Position the modal centrally using JavaScript, because CSS sucks.
-					// Actually it doesn't, but it is hard to globally position.
-					//var modal_height = $(modal_id).innerHeight()
-					//var modal_width = $(modal_id).innerWidth()
+					// Position the modal centrally inside the overlay using flexbox.
 					if ( options.modalCenter ) {
-						$(modal_id).css({
-							'display': 'block',
-							'opacity': 0,
-							'z-index': 11000,
-						})
 						$(modal_id).appendTo('#js-leanmodal-overlay')
 					}
 
 					////	Curtain Up
 					// Fade in the modal and overlay.
-					$('#js-leanmodal-overlay').css({ 'display': 'flex', opacity: 0 })
-					$('#js-leanmodal-overlay').fadeTo(options.fadeTime, 1)
-					$(modal_id).fadeTo(options.fadeTime, 1)
+					$('#js-leanmodal-overlay').removeClass('js-leanmodal-inactive').addClass('js-leanmodal-active')
+					$(modal_id).removeClass('js-leanmodal-inactive').addClass('js-leanmodal-active')
 
 					////	Default Prevention
 					// Prevent whatever the default was (probably scrolling).
diff --git a/jQuery.leanModal2.min.js b/jQuery.leanModal2.min.js
index 174535a..84dea2d 100644
--- a/jQuery.leanModal2.min.js
+++ b/jQuery.leanModal2.min.js
@@ -1,2 +1,2 @@
-// jQuery.leanModal2.js v2.6.2 -  MIT Licensed by eustasy https://eustasy.org
-!function(e){e.fn.extend({leanModal:function(a){function l(l){e("#js-leanmodal-overlay").fadeOut(a.fadeTime),e(l).fadeOut(a.fadeTime),e("#js-leanmodal-overlay").unbind("click"),e(document).off("keyup"),e(l).appendTo("body"),e("#js-leanmodal-overlay").remove()}return a=e.extend({overlayOpacity:.7,closeButton:".js-leanmodal-close",disableCloseOnOverlayClick:!1,disableCloseOnEscape:!1,fadeTime:200,modalCenter:!0},a),this.each(function(){e(this).css({cursor:"pointer"}),e(this).unbind("click").click(function(o){var n;if(e(this).attr("data-modal-id"))n=e(this).attr("data-modal-id");else{if(!e(this).attr("href"))return!1;n=e(this).attr("href")}if(a.closeButton&&e(a.closeButton).click(function(){l(n)}),a.disableCloseOnEscape||e(document).on("keyup",function(e){27==e.keyCode&&l(n)}),0==e("#js-leanmodal-overlay").length){var t="background: rgba(0, 0, 0, "+a.overlayOpacity+"); display: none; height: 100%; left: 0; position: fixed; top: 0; width: 100%; z-index: 100; align-items: center; justify-content: center;",i=e('<div id="js-leanmodal-overlay" style="'+t+'"></div>');e("body").append(i)}a.disableCloseOnOverlayClick||e("#js-leanmodal-overlay").click(function(e){e.target==this&&l(n)}),a.modalCenter&&(e(n).css({display:"block",opacity:0,"z-index":11e3}),e(n).appendTo("#js-leanmodal-overlay")),e("#js-leanmodal-overlay").css({display:"flex",opacity:0}),e("#js-leanmodal-overlay").fadeTo(a.fadeTime,1),e(n).fadeTo(a.fadeTime,1),o.preventDefault()})})}})}(jQuery);
+// jQuery.leanModal2.js v2.6.3 -  MIT Licensed by eustasy https://eustasy.org
+!function(t){t.fn.extend({leanModal:function(e){function a(e){t("#js-leanmodal-overlay").removeClass("js-leanmodal-active").addClass("js-leanmodal-inactive"),t(e).removeClass("js-leanmodal-active").addClass("js-leanmodal-inactive"),t("#js-leanmodal-overlay").unbind("click"),t(document).off("keyup"),t(e).appendTo("body")}return(e=t.extend({defaultStyles:!0,fadeTime:200,overlayOpacity:.7,closeButton:".js-leanmodal-close",disableCloseOnOverlayClick:!1,disableCloseOnEscape:!1,modalCenter:!0},e)).defaultStyles&&0==t("#js-leanmodal-styles").length&&t("<style>").prop("type","text/css").prop("id","js-leanmodal-styles").html(" @keyframes smoothFadeOut { from { opacity: 1; } to { opacity: 0; } } @keyframes smoothFadeIn { from { opacity: 0; } to { opacity: 1; } } #js-leanmodal-overlay { align-items: center; background: rgba(0, 0, 0, "+e.overlayOpacity+"); display: none; height: 100%; justify-content: center; left: 0; position: fixed; top: 0; width: 100%; } .js-leanmodal-inactive { animation: smoothFadeOut "+e.fadeTime+"ms ease-in-out both; } .js-leanmodal-active { animation: smoothFadeIn "+e.fadeTime+"ms ease-in-out both; display: block; z-index: 1000 } #js-leanmodal-overlay.js-leanmodal-active { display: flex; z-index: 100; }").appendTo("head"),this.each(function(){t(this).css({cursor:"pointer"}),t(this).unbind("click").click(function(l){var o;if(t(this).attr("data-modal-id"))o=t(this).attr("data-modal-id");else{if(!t(this).attr("href"))return!1;o=t(this).attr("href")}if(e.closeButton&&t(e.closeButton).click(function(){a(o)}),e.disableCloseOnEscape||t(document).on("keyup",function(t){27==t.keyCode&&a(o)}),0==t("#js-leanmodal-overlay").length){var n=t('<div id="js-leanmodal-overlay"></div>');t("body").append(n)}e.disableCloseOnOverlayClick||t("#js-leanmodal-overlay").click(function(t){t.target==this&&a(o)}),e.modalCenter&&t(o).appendTo("#js-leanmodal-overlay"),t("#js-leanmodal-overlay").removeClass("js-leanmodal-inactive").addClass("js-leanmodal-active"),t(o).removeClass("js-leanmodal-inactive").addClass("js-leanmodal-active"),l.preventDefault()})})}})}(jQuery);

From 80c111656cdcc41c87340d0ab2bb7b7c0daea47e Mon Sep 17 00:00:00 2001
From: Lewis Goddard <lewisgoddard@eustasy.org>
Date: Thu, 15 Feb 2018 00:26:44 +0000
Subject: [PATCH 2/2] Move last CSS bit

---
 jQuery.leanModal2.js     | 5 ++++-
 jQuery.leanModal2.min.js | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jQuery.leanModal2.js b/jQuery.leanModal2.js
index aaad640..8308af7 100644
--- a/jQuery.leanModal2.js
+++ b/jQuery.leanModal2.js
@@ -53,6 +53,9 @@
 								top: 0;\
 								width: 100%;\
 							}\
+							.js-leanmodal-link {\
+								cursor: pointer;\
+							}\
 							.js-leanmodal-inactive {\
 								animation: smoothFadeOut ' + options.fadeTime + 'ms ease-in-out both;\
 							}\
@@ -83,7 +86,7 @@
 			// FOREACHLINK For each targeted link.
 			return this.each(function() {
 				// Force this to look like a link.
-				$(this).css({ 'cursor': 'pointer' })
+				$(this).addClass('js-leanmodal-link')
 
 				////	Command Override
 				// Override the existing click command,
diff --git a/jQuery.leanModal2.min.js b/jQuery.leanModal2.min.js
index 84dea2d..1d24df4 100644
--- a/jQuery.leanModal2.min.js
+++ b/jQuery.leanModal2.min.js
@@ -1,2 +1,2 @@
 // jQuery.leanModal2.js v2.6.3 -  MIT Licensed by eustasy https://eustasy.org
-!function(t){t.fn.extend({leanModal:function(e){function a(e){t("#js-leanmodal-overlay").removeClass("js-leanmodal-active").addClass("js-leanmodal-inactive"),t(e).removeClass("js-leanmodal-active").addClass("js-leanmodal-inactive"),t("#js-leanmodal-overlay").unbind("click"),t(document).off("keyup"),t(e).appendTo("body")}return(e=t.extend({defaultStyles:!0,fadeTime:200,overlayOpacity:.7,closeButton:".js-leanmodal-close",disableCloseOnOverlayClick:!1,disableCloseOnEscape:!1,modalCenter:!0},e)).defaultStyles&&0==t("#js-leanmodal-styles").length&&t("<style>").prop("type","text/css").prop("id","js-leanmodal-styles").html(" @keyframes smoothFadeOut { from { opacity: 1; } to { opacity: 0; } } @keyframes smoothFadeIn { from { opacity: 0; } to { opacity: 1; } } #js-leanmodal-overlay { align-items: center; background: rgba(0, 0, 0, "+e.overlayOpacity+"); display: none; height: 100%; justify-content: center; left: 0; position: fixed; top: 0; width: 100%; } .js-leanmodal-inactive { animation: smoothFadeOut "+e.fadeTime+"ms ease-in-out both; } .js-leanmodal-active { animation: smoothFadeIn "+e.fadeTime+"ms ease-in-out both; display: block; z-index: 1000 } #js-leanmodal-overlay.js-leanmodal-active { display: flex; z-index: 100; }").appendTo("head"),this.each(function(){t(this).css({cursor:"pointer"}),t(this).unbind("click").click(function(l){var o;if(t(this).attr("data-modal-id"))o=t(this).attr("data-modal-id");else{if(!t(this).attr("href"))return!1;o=t(this).attr("href")}if(e.closeButton&&t(e.closeButton).click(function(){a(o)}),e.disableCloseOnEscape||t(document).on("keyup",function(t){27==t.keyCode&&a(o)}),0==t("#js-leanmodal-overlay").length){var n=t('<div id="js-leanmodal-overlay"></div>');t("body").append(n)}e.disableCloseOnOverlayClick||t("#js-leanmodal-overlay").click(function(t){t.target==this&&a(o)}),e.modalCenter&&t(o).appendTo("#js-leanmodal-overlay"),t("#js-leanmodal-overlay").removeClass("js-leanmodal-inactive").addClass("js-leanmodal-active"),t(o).removeClass("js-leanmodal-inactive").addClass("js-leanmodal-active"),l.preventDefault()})})}})}(jQuery);
+!function(t){t.fn.extend({leanModal:function(a){function e(a){t("#js-leanmodal-overlay").removeClass("js-leanmodal-active").addClass("js-leanmodal-inactive"),t(a).removeClass("js-leanmodal-active").addClass("js-leanmodal-inactive"),t("#js-leanmodal-overlay").unbind("click"),t(document).off("keyup"),t(a).appendTo("body")}return(a=t.extend({defaultStyles:!0,fadeTime:200,overlayOpacity:.7,closeButton:".js-leanmodal-close",disableCloseOnOverlayClick:!1,disableCloseOnEscape:!1,modalCenter:!0},a)).defaultStyles&&0==t("#js-leanmodal-styles").length&&t("<style>").prop("type","text/css").prop("id","js-leanmodal-styles").html(" @keyframes smoothFadeOut { from { opacity: 1; } to { opacity: 0; } } @keyframes smoothFadeIn { from { opacity: 0; } to { opacity: 1; } } #js-leanmodal-overlay { align-items: center; background: rgba(0, 0, 0, "+a.overlayOpacity+"); display: none; height: 100%; justify-content: center; left: 0; position: fixed; top: 0; width: 100%; } .js-leanmodal-link { cursor: pointer; } .js-leanmodal-inactive { animation: smoothFadeOut "+a.fadeTime+"ms ease-in-out both; } .js-leanmodal-active { animation: smoothFadeIn "+a.fadeTime+"ms ease-in-out both; display: block; z-index: 1000 } #js-leanmodal-overlay.js-leanmodal-active { display: flex; z-index: 100; }").appendTo("head"),this.each(function(){t(this).addClass("js-leanmodal-link"),t(this).unbind("click").click(function(l){var o;if(t(this).attr("data-modal-id"))o=t(this).attr("data-modal-id");else{if(!t(this).attr("href"))return!1;o=t(this).attr("href")}if(a.closeButton&&t(a.closeButton).click(function(){e(o)}),a.disableCloseOnEscape||t(document).on("keyup",function(t){27==t.keyCode&&e(o)}),0==t("#js-leanmodal-overlay").length){var n=t('<div id="js-leanmodal-overlay"></div>');t("body").append(n)}a.disableCloseOnOverlayClick||t("#js-leanmodal-overlay").click(function(t){t.target==this&&e(o)}),a.modalCenter&&t(o).appendTo("#js-leanmodal-overlay"),t("#js-leanmodal-overlay").removeClass("js-leanmodal-inactive").addClass("js-leanmodal-active"),t(o).removeClass("js-leanmodal-inactive").addClass("js-leanmodal-active"),l.preventDefault()})})}})}(jQuery);