Skip to content
Snippets Groups Projects
Commit f1fef867 authored by srosse's avatar srosse
Browse files

OO-1327: really set the standard mode

parent 2924a686
No related branches found
No related tags found
No related merge requests found
...@@ -107,24 +107,35 @@ public class IFrameDeliveryMapper implements Mapper, Serializable { ...@@ -107,24 +107,35 @@ public class IFrameDeliveryMapper implements Mapper, Serializable {
public void setDeliveryOptions(DeliveryOptions config) { public void setDeliveryOptions(DeliveryOptions config) {
if(config != null) { if(config != null) {
jQueryEnabled = config.getjQueryEnabled(); Boolean standard = config.getStandardMode();
prototypeEnabled = config.getPrototypeEnabled(); if(standard != null && standard.booleanValue()) {
if(config.getGlossaryEnabled() != null) { rawContent = true;
enableTextmarking = config.getGlossaryEnabled().booleanValue(); openolatCss = false;
jQueryEnabled = false;
prototypeEnabled = false;
enableTextmarking = false;
adjusteightAutomatically = false;
} else {
jQueryEnabled = config.getjQueryEnabled();
prototypeEnabled = config.getPrototypeEnabled();
if(config.getGlossaryEnabled() != null) {
enableTextmarking = config.getGlossaryEnabled().booleanValue();
}
openolatCss = config.getOpenolatCss();
if(DeliveryOptions.CONFIG_HEIGHT_AUTO.equals(config.getHeight())) {
adjusteightAutomatically = true;
} else if(StringHelper.containsNonWhitespace(config.getHeight())) {
adjusteightAutomatically = false;
}
} }
openolatCss = config.getOpenolatCss();
if(config.getContentEncoding() != null) { if(config.getContentEncoding() != null) {
contentEncoding = config.getContentEncoding(); contentEncoding = config.getContentEncoding();
} }
if(config.getJavascriptEncoding() != null) { if(config.getJavascriptEncoding() != null) {
jsEncoding = config.getJavascriptEncoding(); jsEncoding = config.getJavascriptEncoding();
} }
if(DeliveryOptions.CONFIG_HEIGHT_AUTO.equals(config.getHeight())) {
adjusteightAutomatically = true;
} else if(StringHelper.containsNonWhitespace(config.getHeight())) {
adjusteightAutomatically = false;
}
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment