Merge pull request neos#1690 from neos/dimaip-fix-params

BUGFIX: retain url params in urls
theDex · Mar 6, 2018 · e2fd121 · e2fd121
2 parents 82ba0af + 055ecc3
commit e2fd121
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/packages/neos-ui-guest-frame/src/initializeGuestFrame.js b/packages/neos-ui-guest-frame/src/initializeGuestFrame.js
@@ -57,8 +57,9 @@ export default ({globalRegistry, store}) => function * initializeGuestFrame() {
     yield put(actions.UI.ContentCanvas.setContextPath(documentInformation.metaData.contextPath, documentInformation.metaData.siteNode));
     yield put(actions.UI.ContentCanvas.setPreviewUrl(documentInformation.metaData.previewUrl));
     yield put(actions.CR.ContentDimensions.setActive(documentInformation.metaData.contentDimensions.active));
-    // the user may have navigated by clicking an inline link - that's why we need to update the contentCanvas URL to be in sync with the shown content
-    yield put(actions.UI.ContentCanvas.setSrc(documentInformation.metaData.url));
+    // The user may have navigated by clicking an inline link - that's why we need to update the contentCanvas URL to be in sync with the shown content.
+    // We need to set the src to the actual src of the iframe, and not retrive it from documentInformation, as it may differ, e.g. contain additional arguments.
+    yield put(actions.UI.ContentCanvas.setSrc(guestFrameWindow.document.location.href));
 
     const focusSelectedNode = event => {
         const clickPath = Array.prototype.slice.call(eventPath(event));