mirror of
https://github.com/moodle/moodle.git
synced 2025-03-03 15:29:08 +01:00
MDL-65447 theme: Apply pendingJS checks to BS transitions
This commit is contained in:
parent
b919ea9299
commit
d27ac4622e
2
theme/boost/amd/build/loader.min.js
vendored
2
theme/boost/amd/build/loader.min.js
vendored
@ -1 +1 @@
|
||||
define(["jquery","./tether","core/event"],function(a,b,c){return window.jQuery=a,window.Tether=b,require(["theme_boost/aria","theme_boost/util","theme_boost/alert","theme_boost/button","theme_boost/carousel","theme_boost/collapse","theme_boost/dropdown","theme_boost/modal","theme_boost/scrollspy","theme_boost/tab","theme_boost/tooltip","theme_boost/popover"],function(b){a("body").popover({trigger:"focus",selector:"[data-toggle=popover][data-trigger!=hover]"}),a("html").popover({container:"body",selector:"[data-toggle=popover][data-trigger=hover]",trigger:"hover",delay:{hide:500}}),c.getLegacyEvents().done(function(b){a(document).on(b.FILTER_CONTENT_UPDATED,function(){a("body").popover({selector:'[data-toggle="popover"]',trigger:"focus"})})}),b.init()}),{}});
|
||||
define(["jquery","./tether","core/event"],function(a,b,c){return window.jQuery=a,window.Tether=b,require(["theme_boost/aria","theme_boost/pending","theme_boost/util","theme_boost/alert","theme_boost/button","theme_boost/carousel","theme_boost/collapse","theme_boost/dropdown","theme_boost/modal","theme_boost/scrollspy","theme_boost/tab","theme_boost/tooltip","theme_boost/popover"],function(b){a("body").popover({trigger:"focus",selector:"[data-toggle=popover][data-trigger!=hover]"}),a("html").popover({container:"body",selector:"[data-toggle=popover][data-trigger=hover]",trigger:"hover",delay:{hide:500}}),c.getLegacyEvents().done(function(b){a(document).on(b.FILTER_CONTENT_UPDATED,function(){a("body").popover({selector:'[data-toggle="popover"]',trigger:"focus"})})}),b.init()}),{}});
|
1
theme/boost/amd/build/pending.min.js
vendored
Normal file
1
theme/boost/amd/build/pending.min.js
vendored
Normal file
@ -0,0 +1 @@
|
||||
define(["jquery"],function(a){var b={alert:[{start:"close",end:"closed"}],carousel:[{start:"slide",end:"slid"}],collapse:[{start:"hide",end:"hidden"},{start:"show",end:"shown"}],dropdown:[{start:"hide",end:"hidden"},{start:"show",end:"shown"}],modal:[{start:"hide",end:"hidden"},{start:"show",end:"shown"}],popover:[{start:"hide",end:"hidden"},{start:"show",end:"shown"}],tab:[{start:"hide",end:"hidden"},{start:"show",end:"shown"}],tooltip:[{start:"hide",end:"hidden"},{start:"show",end:"shown"}]};Object.keys(b).forEach(function(c){b[c].forEach(function(b){var d=b.start+".bs."+c,e=b.end+".bs."+c;a(document.body).on(d,function(){M.util.js_pending(e)}),a(document.body).on(e,function(){M.util.js_complete(e)})})})});
|
@ -29,6 +29,7 @@ define(['jquery', './tether', 'core/event'], function(jQuery, Tether, Event) {
|
||||
window.Tether = Tether;
|
||||
|
||||
require(['theme_boost/aria',
|
||||
'theme_boost/pending',
|
||||
'theme_boost/util',
|
||||
'theme_boost/alert',
|
||||
'theme_boost/button',
|
||||
|
120
theme/boost/amd/src/pending.js
Normal file
120
theme/boost/amd/src/pending.js
Normal file
@ -0,0 +1,120 @@
|
||||
// This file is part of Moodle - http://moodle.org/
|
||||
//
|
||||
// Moodle is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Moodle is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/**
|
||||
* Add Pending JS checks to stock Bootstrap transitions.
|
||||
*
|
||||
* @module theme_boost/pending
|
||||
* @copyright 2019 Andrew Nicols <andrew@nicols.co.uk>
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
define(['jquery'], function($) {
|
||||
var moduleTransitions = {
|
||||
alert: [
|
||||
// Alert.
|
||||
{
|
||||
start: 'close',
|
||||
end: 'closed',
|
||||
},
|
||||
],
|
||||
|
||||
carousel: [
|
||||
{
|
||||
start: 'slide',
|
||||
end: 'slid',
|
||||
},
|
||||
],
|
||||
|
||||
collapse: [
|
||||
{
|
||||
start: 'hide',
|
||||
end: 'hidden',
|
||||
},
|
||||
{
|
||||
start: 'show',
|
||||
end: 'shown',
|
||||
},
|
||||
],
|
||||
|
||||
dropdown: [
|
||||
{
|
||||
start: 'hide',
|
||||
end: 'hidden',
|
||||
},
|
||||
{
|
||||
start: 'show',
|
||||
end: 'shown',
|
||||
},
|
||||
],
|
||||
|
||||
modal: [
|
||||
{
|
||||
start: 'hide',
|
||||
end: 'hidden',
|
||||
},
|
||||
{
|
||||
start: 'show',
|
||||
end: 'shown',
|
||||
},
|
||||
],
|
||||
|
||||
popover: [
|
||||
{
|
||||
start: 'hide',
|
||||
end: 'hidden',
|
||||
},
|
||||
{
|
||||
start: 'show',
|
||||
end: 'shown',
|
||||
},
|
||||
],
|
||||
|
||||
tab: [
|
||||
{
|
||||
start: 'hide',
|
||||
end: 'hidden',
|
||||
},
|
||||
{
|
||||
start: 'show',
|
||||
end: 'shown',
|
||||
},
|
||||
],
|
||||
|
||||
tooltip: [
|
||||
{
|
||||
start: 'hide',
|
||||
end: 'hidden',
|
||||
},
|
||||
{
|
||||
start: 'show',
|
||||
end: 'shown',
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
Object.keys(moduleTransitions).forEach(function(key) {
|
||||
moduleTransitions[key].forEach(function(pair) {
|
||||
var eventStart = pair.start + '.bs.' + key;
|
||||
var eventEnd = pair.end + '.bs.' + key;
|
||||
$(document.body).on(eventStart, function() {
|
||||
M.util.js_pending(eventEnd);
|
||||
});
|
||||
|
||||
$(document.body).on(eventEnd, function() {
|
||||
M.util.js_complete(eventEnd);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
Loading…
x
Reference in New Issue
Block a user