mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-02 14:18:46 +02:00
Merge branch 'pull/5384' into 3.1
This commit is contained in:
commit
71a4f1e605
@ -150,7 +150,7 @@ jQuery.noConflict();
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Show message (but ignore aborted requests)
|
// Show message (but ignore aborted requests)
|
||||||
if(xhr.status !== 0 && msg && $.inArray(msg, ignoredMessages)) {
|
if(xhr.status !== 0 && msg && $.inArray(msg, ignoredMessages) === -1) {
|
||||||
// Decode into UTF-8, HTTP headers don't allow multibyte
|
// Decode into UTF-8, HTTP headers don't allow multibyte
|
||||||
statusMessage(decodeURIComponent(msg), msgType);
|
statusMessage(decodeURIComponent(msg), msgType);
|
||||||
}
|
}
|
||||||
@ -816,9 +816,9 @@ jQuery.noConflict();
|
|||||||
sessionStates = sessionData ? JSON.parse(sessionData) : false;
|
sessionStates = sessionData ? JSON.parse(sessionData) : false;
|
||||||
|
|
||||||
this.find('.cms-tabset, .ss-tabset').each(function() {
|
this.find('.cms-tabset, .ss-tabset').each(function() {
|
||||||
var index,
|
var index,
|
||||||
tabset = $(this),
|
tabset = $(this),
|
||||||
tabsetId = tabset.attr('id'),
|
tabsetId = tabset.attr('id'),
|
||||||
tab,
|
tab,
|
||||||
forcedTab = tabset.children('ul').children('li.ss-tabs-force-active');
|
forcedTab = tabset.children('ul').children('li.ss-tabs-force-active');
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user