This commit is contained in:
2024-07-04 20:19:16 +03:00
parent ec132e69ca
commit abfcb1ae57
2 changed files with 20 additions and 7 deletions
+19 -6
View File
@@ -1,5 +1,10 @@
var __PluginManagerConfigHandler__ = function() { var __PluginManagerConfigHandler__ = function() {
var root = __pmConfig__.assetsPath; var root = __pmConfig__.assetsPath;
var hasJQuery = function(){
return window.hasOwnProperty('jQuery') && window.jQuery.hasOwnProperty('fn');
}
return { return {
menu: { menu: {
path: root + '/menu', path: root + '/menu',
@@ -46,7 +51,7 @@ var __PluginManagerConfigHandler__ = function() {
}; };
var J = function(){ var J = function(){
if(!J.init){ if(!J.init){
J.init = false; J.init = true;
__PluginManager__.ready('jquery'); __PluginManager__.ready('jquery');
} }
var c = []; var c = [];
@@ -74,6 +79,9 @@ var __PluginManagerConfigHandler__ = function() {
}; };
JQueryProxy.prototype.onJQueryInstall = function(plugin){ JQueryProxy.prototype.onJQueryInstall = function(plugin){
var self = this; var self = this;
if(!plugin.module.initer){
return;
}
(function(w){ (function(w){
var q = plugin.module.initer.queue; var q = plugin.module.initer.queue;
if(self.hasJQueryIniter()){ if(self.hasJQueryIniter()){
@@ -94,7 +102,6 @@ var __PluginManagerConfigHandler__ = function() {
}; };
module.exports = new JQueryProxy(); module.exports = new JQueryProxy();
}, },
}, },
jquery: { jquery: {
@@ -103,12 +110,18 @@ var __PluginManagerConfigHandler__ = function() {
type: 'UMD', type: 'UMD',
alias: ['$', 'jQuery'], alias: ['$', 'jQuery'],
onRegister: function (plugin) { onRegister: function (plugin) {
var proxy = kit.require('jqueryProxy'); if(hasJQuery()){
proxy.onJQueryRegister(plugin); plugin.module.exports = window.jQuery;
plugin.config.module = '';
} else {
plugin.proxy = kit.require('jqueryProxy');
plugin.proxy.onJQueryRegister(plugin);
}
}, },
onInstall: function(plugin){ onInstall: function(plugin){
var proxy = kit.require('jqueryProxy'); if(plugin.proxy){
proxy.onJQueryInstall(plugin); proxy.onJQueryInstall(plugin);
}
}, },
}, },
popper: { popper: {
File diff suppressed because one or more lines are too long