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

OO-1471: make the URL to TinyMCE javascript using the version number, remove unused stuff

parent 3cefa2f1
No related branches found
No related tags found
No related merge requests found
......@@ -101,7 +101,7 @@ class RichTextElementRenderer extends DefaultComponentRenderer {
config.appendConfigToTinyJSArray_4(configurations, translator);
StringOutput baseUrl = new StringOutput();
StaticMediaDispatcher.renderStaticURI(baseUrl, "js/tinymce4/tinymce/tinymce.min.js", false);
StaticMediaDispatcher.renderStaticURI(baseUrl, "js/tinymce4/tinymce/tinymce.min.js", true);
sb.append("<script type='text/javascript'>/* <![CDATA[ */ ");
//file browser url
......
......@@ -22,8 +22,6 @@
<bean class="org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatmovieviewer.OlatMovieViewerPlugin">
<property name="pluginParameters">
<map>
<!-- URL to movie viewer, must be absolute URI. The context path will be add in the plugin -->
<entry key="movieViewerUrl" value="/raw/_noversion_/movie/tinyMCE/movieViewer.swf" />
<!-- The place horizontaly and vertically that the player uses for navigation -->
<entry key="playerOffsetHeight" value="0" />
<entry key="playerOffsetWidth" value="0" />
......
......@@ -25,7 +25,6 @@ import java.util.Map;
import org.olat.core.dispatcher.impl.StaticMediaDispatcher;
import org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.TinyMCECustomPlugin;
import org.olat.core.util.WebappHelper;
/**
* Description:<br>
......@@ -57,7 +56,6 @@ public class OlatMovieViewerPlugin extends TinyMCECustomPlugin {
@Override
public Map<String, String> getPluginParameters() {
// Create only if not already present.
Map<String, String> params = super.getPluginParameters();
if (params == null) {
......@@ -66,18 +64,9 @@ public class OlatMovieViewerPlugin extends TinyMCECustomPlugin {
// Get static URI for transparent GIF.
params.put("transparentImage", StaticMediaDispatcher.createStaticURIFor("images/transparent.gif", false));
params.put("playerScript", StaticMediaDispatcher.createStaticURIFor("movie/player.js", false));
params.put("playerScript", StaticMediaDispatcher.createStaticURIFor("movie/player.js", true));
setPluginParameters(params);
return params;
}
@Override
public void setPluginParameters(Map<String,String> pluginParameters) {
//use only one source for the servlet context path
if(pluginParameters.containsKey("movieViewerUrl") && !pluginParameters.get("movieViewerUrl").startsWith(WebappHelper.getServletContextPath())) {
pluginParameters.put("movieViewerUrl", WebappHelper.getServletContextPath() + pluginParameters.get("movieViewerUrl"));
}
super.setPluginParameters(pluginParameters);
}
}
......@@ -174,7 +174,6 @@
function _getEmbed(p) {
// player configuration
var playerSrc = top.tinymce.activeEditor.getParam("olatmovieviewer_movieViewerUrl");
var playerOffsetHeight = top.tinymce.activeEditor.getParam("olatmovieviewer_playerOffsetHeight");
var playerOffsetWidth = top.tinymce.activeEditor.getParam("olatmovieviewer_playerOffsetWidth");
var playerWidth = typeof(p.width) != "undefined" ? (parseInt(p.width) + parseInt(playerOffsetWidth)) : '320';
......
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