extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better way to avoid JS errors if nextmatch is disabled

Browse Source
This commit is contained in:
nathangray 2019-04-01 16:49:28 -06:00
parent eb45eea505
commit bec4eb8cf1
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
api/js/etemplate/et2_extension_nextmatch.js
View File

@ -1741,6 +1741,11 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
return;
}
if(this.options.disabled)
{
return;
}
// Deferred parse function - template might not be fully loaded
var parse = function(template)
{
@ -1798,20 +1803,17 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
template.loadingFinished(promise);
// Wait until template (& children) are done
if(!this.options.disabled)
{
jQuery.when.apply(null, promise).done(
jQuery.proxy(function() {
parse.call(this, template);
if(!this.dynheight)
{
this.dynheight = this._getDynheight(this);
}
this.dynheight.initialized = false;
this.resize();
}, this)
);
}
jQuery.when.apply(null, promise).done(
jQuery.proxy(function() {
parse.call(this, template);
if(!this.dynheight)
{
this.dynheight = this._getDynheight(this);
}
this.dynheight.initialized = false;
this.resize();
}, this)
);
},
// Some accessors to match conventions