pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #879 from markwal/onSettingsShown

Browse source 
onSettingsShown/Hidden call only on parent dialog shown/hidden
This commit is contained in:
Gina Häußge 2015-05-05 21:57:34 +02:00
commit 3e5298fcab
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/octoprint/static/js/app/viewmodels/settings.js
View file

@ -142,19 +142,23 @@ $(function() {
};
self.onAllBound = function(allViewModels) {
self.settingsDialog.on('show', function() {
_.each(allViewModels, function(viewModel) {
if (viewModel.hasOwnProperty("onSettingsShown")) {
viewModel.onSettingsShown();
}
});
self.settingsDialog.on('show', function(event) {
if (event.target.id == "settings_dialog") {
_.each(allViewModels, function(viewModel) {
if (viewModel.hasOwnProperty("onSettingsShown")) {
viewModel.onSettingsShown();
}
});
}
});
self.settingsDialog.on('hidden', function() {
_.each(allViewModels, function(viewModel) {
if (viewModel.hasOwnProperty("onSettingsHidden")) {
viewModel.onSettingsHidden();
}
});
if (event.target.id == "settings_dialog") {
_.each(allViewModels, function(viewModel) {
if (viewModel.hasOwnProperty("onSettingsHidden")) {
viewModel.onSettingsHidden();
}
});
}
});
self.settingsDialog.on('beforeSave', function () {
_.each(allViewModels, function (viewModel) {