Merge pull request #879 from markwal/onSettingsShown

onSettingsShown/Hidden call only on parent dialog shown/hidden
OctoPrint · May 5, 2015 · 3e5298f · 3e5298f
2 parents 84cda5c + dbc2fe9
commit 3e5298f
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js
@@ -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) {