Skip to content
This repository was archived by the owner on Mar 25, 2026. It is now read-only.

Fixed: fails opening modaal at second time with start_open:true #130

Open
NishiokaTakeo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed: fails opening modaal at second time with start_open:true #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions source/js/modaal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
( function( $ ) {

var modaal_loading_spinner = '<div class="modaal-loading-spinner"><div><div></div></div><div><div></div></div><div><div></div></div><div><div></div></div><div><div></div></div><div><div></div></div><div><div></div></div><div><div></div></div></div>'

var Modaal = {
init : function(options, elem) {
var self = this;
Expand All @@ -111,7 +111,7 @@
};

self.lastFocus = null;

// if is_locked
if ( self.options.is_locked || self.options.type == 'confirm' || self.options.hide_close ) {
self.scope.close_btn = '';
Expand Down Expand Up @@ -398,7 +398,7 @@

// close off modaal-inner-wrapper
build_markup += '</div>';

// If type is image AND outer_controls is true: add gallery next and previous controls.
if (self.options.type == 'image' && self.options.outer_controls === true) {
build_markup += self.scope.prev_btn + self.scope.next_btn;
Expand Down Expand Up @@ -460,10 +460,10 @@
dataType: "jsonp",
cache: false,
success: function (data) {

// Create temp dom element from which we'll clone into the modaal instance. This is required to bypass the unusual small thumb issue instagram oembed was serving up
self.dom.append('<div id="temp-ig" style="width:0;height:0;overflow:hidden;">' + data.html + '</div>');

// Check if it has loaded once before.
// This is to stop the Embeds.process from throwing and error the first time it's being loaded.
// private_options are individual to a modaal_scope so will not work across multiple scopes when checking if true, only that one item.
Expand All @@ -483,7 +483,7 @@
$('#temp-ig').remove();
}, 1000);
}

},
error: function() {
content = error_msg;
Expand Down Expand Up @@ -576,7 +576,7 @@

var modaal_image_markup = '';
var gallery_total;

// If has group attribute
if ( self.$elem.is('[data-group]') || self.$elem.is('[rel]') ) {

Expand Down Expand Up @@ -1074,6 +1074,14 @@
break;
}
}
else
{
if( options.start_open === true)
{
existing_modaal.init(options, this);
$.data(this, "modaal", existing_modaal);
}
}
} else {
// Not a string, so let's setup the modal ready to use
var modaal = Object.create(Modaal);
Expand Down Expand Up @@ -1354,7 +1362,7 @@
var findElement = [].some.call(mutation.addedNodes, function(el) {
var elm = $(el);
if ( elm.is('a') || elm.is('button') ) {

if ( elm.hasClass('modaal') ) {
// is inline Modaal, initialise options
modaal_inline_options(elm);
Expand Down