Merge pull request #1675 from spadgett/detect-blocked-confirm-on-exit-dialog

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/constants.js

@@ -78,6 +78,10 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
   // removes the option from the route creation form.
   DISABLE_WILDCARD_ROUTES: true,
 
+  // true indicates that the web console should not show confirmation prompts
+  // when users navigate away from a page without saving.
+  DISABLE_CONFIRM_ON_EXIT: false,
+
   // This blacklist hides certain kinds from the "Other Resources" page because they are unpersisted, disallowed for most end users, or not supported by openshift but exist in kubernetes
   AVAILABLE_KINDS_BLACKLIST: [],
 

app/scripts/directives/confirmOnExit.js

@@ -2,13 +2,20 @@
 
 // http://stackoverflow.com/questions/14852802/detect-unsaved-changes-and-alert-user-using-angularjs
 angular.module("openshiftConsole")
-  .directive("confirmOnExit", function() {
+  .directive("confirmOnExit", function(Logger) {
     return {
       scope: {
         dirty: '=',
         message: '='
       },
       link: function($scope) {
+        // If the feature is disabled or the user has asked the browser to
+        // block dialogs, don't try to prompt.
+        if (_.get(window, 'OPENSHIFT_CONSTANTS.DISABLE_CONFIRM_ON_EXIT') ||
+            _.get(window, 'OPENSHIFT_CONSTANTS.CONFIRM_DIALOG_BLOCKED')) {
+          return;
+        }
+
         var getMessage = function() {
           return $scope.message || "You have unsaved changes. Leave this page anyway?";
         };
@@ -27,7 +34,27 @@ angular.module("openshiftConsole")
             return;
           }
 
-          if(!confirm(getMessage())) {
+          var start = new Date().getTime();
+
+          // Use a native confirm dialog to block code execution since we're in
+          // the location change listener.
+          var okToExit = confirm(getMessage());
+          if (okToExit) {
+            return;
+          }
+
+          // Workaround "Prevent this page from creating additional dialogs"
+          //
+          // If the response took less than 50ms, assume the confirm dialog was
+          // blocked by the browser. There's no API to detect that the user
+          // has told the browser to block these dialogs, and the user can't
+          // navigate away otherwise.
+          var end = new Date().getTime();
+          if ((end - start) < 50) {
+            // Remember that the user is blocking dialogs. This is a per session settings.
+            _.set(window, 'OPENSHIFT_CONSTANTS.CONFIRM_DIALOG_BLOCKED', true);
+            Logger.warn("Confirm on exit prompt appears to have been blocked by the browser.");
+          } else {
             event.preventDefault();
           }
         });

dist/scripts/scripts.js

@@ -690,6 +690,7 @@ DEFAULT_HPA_CPU_TARGET_PERCENT:80,
 DISABLE_OVERVIEW_METRICS:!1,
 DISABLE_CUSTOM_METRICS:!1,
 DISABLE_WILDCARD_ROUTES:!0,
+DISABLE_CONFIRM_ON_EXIT:!1,
 AVAILABLE_KINDS_BLACKLIST:[],
 ENABLE_TECH_PREVIEW_FEATURE:{
 service_catalog_landing_page:!1,
@@ -13304,28 +13305,36 @@ e.findReferenceValueForEntries(b.entries, b.valueFromSelectorOptions);
 } ]
 };
 } ]);
-}(), angular.module("openshiftConsole").directive("confirmOnExit", function() {
+}(), angular.module("openshiftConsole").directive("confirmOnExit", [ "Logger", function(a) {
 return {
 scope:{
 dirty:"=",
 message:"="
 },
-link:function(a) {
-var b = function() {
-return a.message || "You have unsaved changes. Leave this page anyway?";
-}, c = function() {
-if (a.dirty) return b();
+link:function(b) {
+if (!_.get(window, "OPENSHIFT_CONSTANTS.DISABLE_CONFIRM_ON_EXIT") && !_.get(window, "OPENSHIFT_CONSTANTS.CONFIRM_DIALOG_BLOCKED")) {
+var c = function() {
+return b.message || "You have unsaved changes. Leave this page anyway?";
+}, d = function() {
+if (b.dirty) return c();
 };
-$(window).on("beforeunload", c);
-var d = a.$on("$locationChangeStart", function(c) {
-a.dirty && (confirm(b()) || c.preventDefault());
+$(window).on("beforeunload", d);
+var e = b.$on("$locationChangeStart", function(d) {
+if (b.dirty) {
+var e = new Date().getTime(), f = confirm(c());
+if (!f) {
+var g = new Date().getTime();
+g - e < 50 ? (_.set(window, "OPENSHIFT_CONSTANTS.CONFIRM_DIALOG_BLOCKED", !0), a.warn("Confirm on exit prompt appears to have been blocked by the browser.")) :d.preventDefault();
+}
+}
 });
-a.$on("$destroy", function() {
-$(window).off("beforeunload", c), d && d();
+b.$on("$destroy", function() {
+$(window).off("beforeunload", d), e && e();
 });
 }
+}
 };
-}), angular.module("openshiftConsole").filter("duration", function() {
+} ]), angular.module("openshiftConsole").filter("duration", function() {
 return function(a, b, c, d) {
 function e(a, b, d) {
 if (0 !== a) return 1 === a ? void (c ? h.push(b) :h.push("1 " + b)) :void h.push(a + " " + d);