Skip to content

Commit 886e83c

Browse files
committed
Fixed merge inaccuracy
1 parent 6927744 commit 886e83c

3 files changed

Lines changed: 34 additions & 35 deletions

File tree

.idea/workspace.xml

Lines changed: 33 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/all.frontend.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,6 @@ slideshow_jquery_image_gallery_script = function()
124124
{
125125
var ajaxStylesheets = $('[id*="slideshow-jquery-image-gallery-ajax-stylesheet_"]');
126126

127-
// No AJAX stylesheets found. If there are slideshows on the page, there is something wrong. A slideshow always comes with an AJAX stylesheet
128-
if (ajaxStylesheets.length <= 0)
129-
{
130-
self.generateStylesheetURLs(false);
131-
132-
return;
133-
}
134-
135127
// Some website disable URL variables, impairing the AJAX loaded stylesheets. Check and fix all slideshow stylesheet related URLs
136128
$.each(ajaxStylesheets, function(ajaxStylesheetKey, ajaxStylesheet)
137129
{

0 commit comments

Comments
 (0)