Skip to content

Fix for global dialogs #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beregovoy68 merged 1 commit into from
Dec 2, 2016
Merged

Fix for global dialogs #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ <h2 class="sectionHeader">NEW ACCOUNT - NOTICE</h2>

<div id="wrapper" ng-switch-when="main-screen" ng-cloak>
<!-- shared blocks -->
<div id="feat-not-active" waves-dialog show-buttons="false" is-error="true">
<div id="feat-not-active" waves-dialog global="true" show-buttons="false" is-error="true">
<h2 class="sectionHeader">NOTICE</h2>
<p>This feature is still under development and not active during the alpha release.
<br/><br/>
Expand Down Expand Up @@ -268,7 +268,7 @@ <h2 class="sectionHeader">NOTICE</h2>
<a ng-click="menu.showBackupDialog()">
<img class="header-Icon fade" tooltipster tooltip-theme="tooltipster-theme2" src="img/uiTB-iconset-backup.svg" alt="Backup" title="Backup"/>
</a>
<div id="header-wPop-backup" waves-dialog on-dialog-ok="menu.backup()" ok-button-caption="COPY" cancel-button-caption="CLOSE">
<div id="header-wPop-backup" waves-dialog global="true" on-dialog-ok="menu.backup()" ok-button-caption="COPY" cancel-button-caption="CLOSE">
<h2 class="sectionHeader">ACCOUNT INFO BACKUP</h2>
<p>Your account's basic information, click the <b>COPY</b> button in order to copy the contents to the clipboard or <b>CLOSE</b> to exit.</p></br>
<form id="backupForm">
Expand Down
2 changes: 1 addition & 1 deletion src/js/shared/dialog.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
dialogs with outdated data
*/
this.cleanup = function () {
var result = $document.find('body > div.modal');
var result = $document.find('body > div.modal.recyclable');
_.forEach(result, function (divNode) {
divNode.remove();
})
Expand Down
6 changes: 5 additions & 1 deletion src/js/shared/shared.dialog.directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@

function WavesDialogLink(scope, element, attrs, controller) {
element.addClass('wavesPop');

if (!scope.global)
element.addClass('recyclable');
}

angular
Expand All @@ -61,7 +64,8 @@
okButtonCaption: '@',
okButtonEnabled: '=?',
cancelButtonCaption: '@',
isError: '=?'
isError: '=?',
global: '=?'
},
link: WavesDialogLink,
template: '<img class="wPop-header" ng-src="img/{{image}}" />' +
Expand Down