Skip to content

Commit a01e1f3

Browse files
lokeshlokesh
committed
chore: rebuild
1 parent 9183b82 commit a01e1f3

7 files changed

+7
-58
lines changed

‎dist/css/lightbox.min.css

+1-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/lightbox-plus-jquery.js

+1-12
Original file line numberDiff line numberDiff line change
@@ -10598,11 +10598,7 @@ return jQuery;
1059810598
} );
1059910599

1060010600
/*!
10601-
<<<<<<< HEAD
10602-
* Lightbox v2.11.0
10603-
=======
1060410601
* Lightbox v2.11.1
10605-
>>>>>>> f3f625ba65ea8727baa4be30e428de45d5b93faa
1060610602
* by Lokesh Dhakar
1060710603
*
1060810604
* More info:
@@ -10702,9 +10698,6 @@ return jQuery;
1070210698
}
1070310699

1070410700
var self = this;
10705-
<<<<<<< HEAD
10706-
$('<div id="lightboxOverlay" class="lightboxOverlay"></div><div id="lightbox" class="lightbox"><div class="lb-outerContainer"><div class="lb-container"><img class="lb-image" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" alt=""/><div class="lb-nav"><a class="lb-prev" aria-label="Previous image" href="" ></a><a class="lb-next" aria-label="Next image" href="" ></a></div><div class="lb-loader"><a class="lb-cancel"></a></div></div></div><div class="lb-dataContainer"><div class="lb-data"><div class="lb-details"><span class="lb-caption"></span><span class="lb-number"></span></div><div class="lb-closeContainer"><a class="lb-close"></a></div></div></div></div>').appendTo($('body'));
10707-
=======
1070810701

1070910702
// The two root notes generated, #lightboxOverlay and #lightbox are given
1071010703
// tabindex attrs so they are focusable. We attach our keyboard event
@@ -10718,7 +10711,6 @@ return jQuery;
1071810711
//
1071910712
// Github issue: https://github.com/lokesh/lightbox2/issues/663
1072010713
$('<div id="lightboxOverlay" tabindex="-1" class="lightboxOverlay"></div><div id="lightbox" tabindex="-1" class="lightbox"><div class="lb-outerContainer"><div class="lb-container"><img class="lb-image" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" alt=""/><div class="lb-nav"><a class="lb-prev" aria-label="Previous image" href="" ></a><a class="lb-next" aria-label="Next image" href="" ></a></div><div class="lb-loader"><a class="lb-cancel"></a></div></div></div><div class="lb-dataContainer"><div class="lb-data"><div class="lb-details"><span class="lb-caption"></span><span class="lb-number"></span></div><div class="lb-closeContainer"><a class="lb-close"></a></div></div></div></div>').appendTo($('body'));
10721-
>>>>>>> f3f625ba65ea8727baa4be30e428de45d5b93faa
1072210714

1072310715
// Cache jQuery objects
1072410716
this.$lightbox = $('#lightbox');
@@ -10942,7 +10934,7 @@ return jQuery;
1094210934
if (self.options.maxWidth && self.options.maxWidth < maxImageWidth) {
1094310935
maxImageWidth = self.options.maxWidth;
1094410936
}
10945-
if (self.options.maxHeight && self.options.maxHeight < maxImageWidth) {
10937+
if (self.options.maxHeight && self.options.maxHeight < maxImageHeight) {
1094610938
maxImageHeight = self.options.maxHeight;
1094710939
}
1094810940

@@ -11132,11 +11124,8 @@ return jQuery;
1113211124

1113311125
var keycode = event.keyCode;
1113411126
if (keycode === KEYCODE_ESC) {
11135-
<<<<<<< HEAD
11136-
=======
1113711127
// Prevent bubbling so as to not affect other components on the page.
1113811128
event.stopPropagation();
11139-
>>>>>>> f3f625ba65ea8727baa4be30e428de45d5b93faa
1114011129
this.end();
1114111130
} else if (keycode === KEYCODE_LEFTARROW) {
1114211131
if (this.currentImageIndex !== 0) {

‎dist/js/lightbox-plus-jquery.min.js

+1-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/lightbox-plus-jquery.min.map

+1-5
Large diffs are not rendered by default.

‎dist/js/lightbox.js

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
/*!
2-
<<<<<<< HEAD
3-
* Lightbox v2.11.0
4-
=======
52
* Lightbox v2.11.1
6-
>>>>>>> f3f625ba65ea8727baa4be30e428de45d5b93faa
73
* by Lokesh Dhakar
84
*
95
* More info:
@@ -103,9 +99,6 @@
10399
}
104100

105101
var self = this;
106-
<<<<<<< HEAD
107-
$('<div id="lightboxOverlay" class="lightboxOverlay"></div><div id="lightbox" class="lightbox"><div class="lb-outerContainer"><div class="lb-container"><img class="lb-image" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" alt=""/><div class="lb-nav"><a class="lb-prev" aria-label="Previous image" href="" ></a><a class="lb-next" aria-label="Next image" href="" ></a></div><div class="lb-loader"><a class="lb-cancel"></a></div></div></div><div class="lb-dataContainer"><div class="lb-data"><div class="lb-details"><span class="lb-caption"></span><span class="lb-number"></span></div><div class="lb-closeContainer"><a class="lb-close"></a></div></div></div></div>').appendTo($('body'));
108-
=======
109102

110103
// The two root notes generated, #lightboxOverlay and #lightbox are given
111104
// tabindex attrs so they are focusable. We attach our keyboard event
@@ -119,7 +112,6 @@
119112
//
120113
// Github issue: https://github.com/lokesh/lightbox2/issues/663
121114
$('<div id="lightboxOverlay" tabindex="-1" class="lightboxOverlay"></div><div id="lightbox" tabindex="-1" class="lightbox"><div class="lb-outerContainer"><div class="lb-container"><img class="lb-image" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" alt=""/><div class="lb-nav"><a class="lb-prev" aria-label="Previous image" href="" ></a><a class="lb-next" aria-label="Next image" href="" ></a></div><div class="lb-loader"><a class="lb-cancel"></a></div></div></div><div class="lb-dataContainer"><div class="lb-data"><div class="lb-details"><span class="lb-caption"></span><span class="lb-number"></span></div><div class="lb-closeContainer"><a class="lb-close"></a></div></div></div></div>').appendTo($('body'));
122-
>>>>>>> f3f625ba65ea8727baa4be30e428de45d5b93faa
123115

124116
// Cache jQuery objects
125117
this.$lightbox = $('#lightbox');
@@ -343,7 +335,7 @@
343335
if (self.options.maxWidth && self.options.maxWidth < maxImageWidth) {
344336
maxImageWidth = self.options.maxWidth;
345337
}
346-
if (self.options.maxHeight && self.options.maxHeight < maxImageWidth) {
338+
if (self.options.maxHeight && self.options.maxHeight < maxImageHeight) {
347339
maxImageHeight = self.options.maxHeight;
348340
}
349341

@@ -533,11 +525,8 @@
533525

534526
var keycode = event.keyCode;
535527
if (keycode === KEYCODE_ESC) {
536-
<<<<<<< HEAD
537-
=======
538528
// Prevent bubbling so as to not affect other components on the page.
539529
event.stopPropagation();
540-
>>>>>>> f3f625ba65ea8727baa4be30e428de45d5b93faa
541530
this.end();
542531
} else if (keycode === KEYCODE_LEFTARROW) {
543532
if (this.currentImageIndex !== 0) {

0 commit comments

Comments
 (0)