Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove rl.showScreenPopup in favour of AbstractViewPopup.showModal

Browse source
This commit is contained in:
the-djmaze 2022-02-07 15:20:39 +01:00
parent 649f74fc51
commit f6400b6da2
5 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dev/Common/Plugins.js
View file

@ -56,5 +56,4 @@ rl.pluginSettingsGet = (pluginSection, name) => {
return plugins ? (null == plugins[name] ? null : plugins[name]) : null; return plugins ? (null == plugins[name] ? null : plugins[name]) : null;
}; };
rl.showPluginPopup = showScreenPopup;
rl.pluginPopupView = AbstractViewPopup; rl.pluginPopupView = AbstractViewPopup;

9
dev/Knoin/AbstractViews.js
View file

@ -3,8 +3,7 @@ import ko from 'ko';
import { inFocus, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'Common/Utils'; import { inFocus, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'Common/Utils';
import { Scope } from 'Common/Enums'; import { Scope } from 'Common/Enums';
import { keyScope, Settings, leftPanelDisabled } from 'Common/Globals'; import { keyScope, Settings, leftPanelDisabled } from 'Common/Globals';
import { ViewType } from 'Knoin/Knoin'; import { ViewType, showScreenPopup } from 'Knoin/Knoin';
//import { showScreenPopup } from 'Knoin/Knoin';
class AbstractView { class AbstractView {
constructor(templateID, type) constructor(templateID, type)
@ -88,11 +87,11 @@ export class AbstractViewPopup extends AbstractView
}); });
} }
} }
/*
AbstractViewPopup.show = function(params = []) { AbstractViewPopup.showModal = function(params = []) {
showScreenPopup(this, params); showScreenPopup(this, params);
} }
*/
AbstractViewPopup.hidden = function() { AbstractViewPopup.hidden = function() {
return !this.__vm || !this.__vm.modalVisibility(); return !this.__vm || !this.__vm.modalVisibility();
} }

8
dev/Knoin/Knoin.js
View file

@ -244,10 +244,7 @@ const
}, 1); }, 1);
} }
} }
}, };
getScreenPopupViewModel = ViewModelClassToShow =>
(buildViewModel(ViewModelClassToShow) && ViewModelClassToShow.__dom) && ViewModelClassToShow.__vm;
export const export const
@ -281,7 +278,8 @@ export const
* @returns {void} * @returns {void}
*/ */
showScreenPopup = (ViewModelClassToShow, params = []) => { showScreenPopup = (ViewModelClassToShow, params = []) => {
const vm = getScreenPopupViewModel(ViewModelClassToShow); const vm = buildViewModel(ViewModelClassToShow) && ViewModelClassToShow.__dom && ViewModelClassToShow.__vm;
if (vm) { if (vm) {
params = params || []; params = params || [];

9
plugins/README.md
View file

@ -5,6 +5,15 @@ class Plugin extends \RainLoop\Plugins\AbstractPlugin
} }
``` ```
JavaScript
```javascript
class PluginPopupView extends rl.pluginPopupView
{
}
PluginPopupView.showModal();
```
# Hooks # Hooks
```php ```php

2
plugins/two-factor-auth/js/TwoFactorAuthSettings.js
View file

@ -117,7 +117,7 @@ class TwoFactorAuthSettings
} }
testTwoFactor() { testTwoFactor() {
rl.showPluginPopup(TwoFactorAuthTestPopupView, [this.twoFactorTested]); TwoFactorAuthTestPopupView.showModal([this.twoFactorTested]);
} }
clearTwoFactor() { clearTwoFactor() {