From 50fefd41c297826adfd2442a4e86f5c360531ae5 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 27 Aug 2014 11:19:12 +0200
Subject: [PATCH] OO-1068: fix single page
---
.../commons/modules/singlepage/SinglePageController.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/core/commons/modules/singlepage/SinglePageController.java b/src/main/java/org/olat/core/commons/modules/singlepage/SinglePageController.java
index e2bad3c7631..3b014febdcd 100644
--- a/src/main/java/org/olat/core/commons/modules/singlepage/SinglePageController.java
+++ b/src/main/java/org/olat/core/commons/modules/singlepage/SinglePageController.java
@@ -204,13 +204,13 @@ public class SinglePageController extends BasicController implements CloneableCo
// a) configured as to be displayed in iframe and not in braille mode
// b) page is a direct jump in (unclear why not in this case, code was like that)
// c) when page type can not be inline rendered (e.g. when page is a pdf file)
- if (jumpIn || !HtmlStaticPageComponent.isFileTypeSupported(startURI)) {
+ //if (g_inFrame alwasytrue || jumpIn || !HtmlStaticPageComponent.isFileTypeSupported(startURI)) {
idc = new IFrameDisplayController(ureq, getWindowControl(), g_new_rootContainer, contextResourcable, deliveryOptions);
listenTo(idc);
idc.setCurrentURI(startURI);
myContent.put("content", idc.getInitialComponent());
- } else {
+ /*} else {
// in inline mode
// create single page root file now and start component for display dispathing
cpc = new HtmlStaticPageComponent("content", g_new_rootContainer);
@@ -229,7 +229,7 @@ public class SinglePageController extends BasicController implements CloneableCo
setCurURI(startURI);
cpc.setCurrentURI(startURI);
}
- }
+ }*/
mainP.setContent(myContent);
mainPanel = putInitialPanel(mainP);
--
GitLab