Permalink
Browse files

Fix #79 - Tinymce icon images not showing on advanced Theme and wicke…

…t deployment mode
  • Loading branch information...
1 parent 7fb7b97 commit 454b6d56d6186ed045907a7e607db6378433cc73 @martin-g martin-g committed Mar 22, 2012
@@ -136,7 +136,7 @@ public FullFeaturedTinyMCEPage()
add(textArea);
}
- private static final String TEXT = "<p><img src=\"logo.jpg\" alt=\" \" hspace=\"5\" vspace=\"5\" width=\"250\" height=\"48\" align=\"right\" />"
+ private static final String TEXT = "<p><img src=\"/logo.jpg\" alt=\" \" hspace=\"5\" vspace=\"5\" width=\"250\" height=\"48\" align=\"right\" />"
+ "TinyMCE is a platform independent web based Javascript HTML <strong>WYSIWYG</strong> editor control released as Open Source under LGPL by Moxiecode Systems AB. "
+ "It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances. TinyMCE is very easy to integrate into other Content Management Systems.</p>"
+ "<p>We recommend <a href=\"http://www.getfirefox.com\" target=\"_blank\">Firefox</a> and <a href=\"http://www.google.com\" target=\"_blank\">Google</a> <br /></p>";
@@ -56,7 +56,7 @@ public ImageUploadTinyMCEPage()
add(textArea);
}
- private static final String TEXT = "<p><img src=\"logo.jpg\" alt=\" \" hspace=\"5\" vspace=\"5\" width=\"250\" height=\"48\" align=\"right\" />"
+ private static final String TEXT = "<p><img src=\"/logo.jpg\" alt=\" \" hspace=\"5\" vspace=\"5\" width=\"250\" height=\"48\" align=\"right\" />"
+ "TinyMCE is a platform independent web based Javascript HTML <strong>WYSIWYG</strong> editor control released as Open Source under LGPL by Moxiecode Systems AB. "
+ "It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances. TinyMCE is very easy to integrate into other Content Management Systems.</p>"
+ "<p>We recommend <a href=\"http://www.getfirefox.com\" target=\"_blank\">Firefox</a> and <a href=\"http://www.google.com\" target=\"_blank\">Google</a> <br /></p>";
@@ -6,9 +6,9 @@
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
-import org.apache.wicket.request.handler.resource.ResourceRequestHandler;
+import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.mapper.AbstractMapper;
-import org.apache.wicket.request.resource.JavaScriptPackageResource;
+import org.apache.wicket.request.resource.PackageResourceReference;
/**
* A request mapper to enable TinyMCE JS to load at runtime other JS resources
@@ -32,9 +32,9 @@ public IRequestHandler mapRequest(Request request)
path += url.substring(url.indexOf(prefix));
if (TinyMceRequestMapper.class.getResource(path) != null)
{
- JavaScriptPackageResource resource = new JavaScriptPackageResource(
- TinyMceRequestMapper.class, path, null, null, null);
- return new ResourceRequestHandler(resource, null);
+ PackageResourceReference resource = new PackageResourceReference(
+ TinyMceRequestMapper.class, path);
+ return new ResourceReferenceRequestHandler(resource, null);
}
}
}

0 comments on commit 454b6d5

Please sign in to comment.