Merge branch 'staging' into communities-trim

www/common/common-interface.js

@@ -70,6 +70,7 @@ define([
                     if (typeof(yes) === 'function') { yes(e); }
                     break;
             }
+            $(el || window).off('keydown', handler);
         };
 
         $(el || window).keydown(handler);
@@ -587,7 +588,7 @@ define([
             $ok.click();
         }, function () {
             $cancel.click();
-        }, ok);
+        }, frame);
 
         document.body.appendChild(frame);
         setTimeout(function () {
@@ -1117,7 +1118,7 @@ define([
 
         var dontShowAgain = h('div.cp-corner-dontshow', [
             h('span.fa.fa-times'),
-            Messages.dontShowAgain || "Don't show again" // XXX
+            Messages.dontShowAgain
         ]);
 
         var popup = h('div.cp-corner-container', [