fix #1108: setting for running in an iframe

app/scripts/app.js

@@ -28,7 +28,7 @@ import 'hbs-helpers';
 const ready = (Launcher && Launcher.ready) || $;
 
 ready(() => {
-    if (AuthReceiver.receive() || Features.isFrame) {
+    if (AuthReceiver.receive()) {
         return;
     }
 
@@ -46,6 +46,11 @@ ready(() => {
         });
 
     function ensureCanRun() {
+        if (Features.isFrame && !appModel.settings.allowIframes) {
+            return Promise.reject(
+                'Running in iframe is not allowed (this can be changed in the app config).'
+            );
+        }
         return FeatureTester.test().catch(e => {
             Alerts.error({
                 header: Locale.appSettingsError,

app/scripts/models/app-settings-model.js

@@ -61,6 +61,7 @@ AppSettingsModel.defineModelProperties(
         generatorPresets: null,
         generatorHidePassword: false,
         cacheConfigSettings: false,
+        allowIframes: false,
 
         canOpen: true,
         canOpenDemo: true,

release-notes.md

@@ -2,6 +2,7 @@ Release notes
 -------------
 ##### v1.12.0 (TBD)
 `-` #1022: fuzzy search  
+`+` #1108: setting for running in an iframe  
 `-` fix #1273: untranslated menu items  
 
 ##### v1.11.6 (2019-10-04)