mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-25 18:19:22 +03:00
Merge branch 'master' into plugin-hooks
# Conflicts: # dev/Common/Plugins.js # dev/Knoin/Knoin.js # dev/Remote/AbstractFetch.js # dev/View/User/Login.js
This commit is contained in:
commit
827cfa5051
892 changed files with 110819 additions and 48675 deletions
|
|
@ -1,5 +1,6 @@
|
|||
import { settingsAddViewModel } from 'Screen/AbstractSettings';
|
||||
import { SettingsGet } from 'Common/Globals';
|
||||
import { AbstractViewPopup } from 'Knoin/AbstractViews';
|
||||
import { isArray, isFunction } from 'Common/Utils';
|
||||
|
||||
const SIMPLE_HOOKS = {},
|
||||
|
|
@ -36,7 +37,7 @@ export function runHook(name, args = []) {
|
|||
* @param {?number=} timeout
|
||||
*/
|
||||
rl.pluginRemoteRequest = (callback, action, parameters, timeout) => {
|
||||
rl.app && rl.app.Remote.defaultRequest(callback, 'Plugin' + action, parameters, timeout);
|
||||
rl.app.Remote.request('Plugin' + action, callback, parameters, timeout);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -78,3 +79,5 @@ rl.pluginSettingsGet = (pluginSection, name) => {
|
|||
plugins = plugins && null != plugins[pluginSection] ? plugins[pluginSection] : null;
|
||||
return plugins ? (null == plugins[name] ? null : plugins[name]) : null;
|
||||
};
|
||||
|
||||
rl.pluginPopupView = AbstractViewPopup;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue