Skip to content

Commit a740ff8

Browse files
authored
PRO-7551 do not show editing UI of subwidgets when live previewing a widget (#4910)
1 parent 05b02a4 commit a740ff8

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

modules/@apostrophecms/area/ui/apos/apps/AposAreas.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,19 @@ export default function() {
2020
widgetsRendering++;
2121
});
2222

23-
apos.bus.$on('widget-rendered', function() {
23+
apos.bus.$on('widget-rendered', options => {
2424
widgetsRendering--;
25-
createAreaAppsAndRunPlayersIfDone();
25+
createAreaAppsAndRunPlayersIfDone(options);
2626
});
2727

2828
apos.bus.$on('refreshed', function() {
2929
createAreaAppsAndRunPlayersIfDone();
3030
});
3131

32-
function createAreaAppsAndRunPlayersIfDone() {
33-
createAreaApps();
32+
function createAreaAppsAndRunPlayersIfDone({ edit = true } = {}) {
33+
if (edit) {
34+
createAreaApps();
35+
}
3436
if (widgetsRendering === 0) {
3537
apos.util.runPlayers();
3638
}

modules/@apostrophecms/widget-type/ui/apos/components/AposWidgetEditor.vue

+3-1
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,9 @@ function guessOrigin(area) {
338338
// side of the screen will least obscure the widget
339339
const rect = area.$el.getBoundingClientRect();
340340
const cx = (rect.right - rect.left) / 2 + rect.left;
341-
if (cx >= (window.innerWidth / 2)) {
341+
// Favor the right hand side slightly because rich text
342+
// subwidgets in centered areas are more intuitive that way
343+
if (cx >= (window.innerWidth * 0.55)) {
342344
return 'left';
343345
} else {
344346
return 'right';

modules/@apostrophecms/widget-type/ui/apos/mixins/AposWidgetMixin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export default {
8383
// in the DOM before hinting that it might be time to prepare
8484
// sub-area editors and run players
8585
setTimeout(function() {
86-
apos.bus.$emit('widget-rendered');
86+
apos.bus.$emit('widget-rendered', { edit: !aposLivePreview });
8787
}, 0);
8888
} catch (e) {
8989
this.rendered = '<p>Unable to render this widget.</p>';

0 commit comments

Comments
 (0)