You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by rf...@apache.org on 2007/05/29 19:34:41 UTC
svn commit: r542599 - in /lenya/trunk/src/modules/fckeditor:
resources/javascript/fckloader.js usecases/fckeditor.jx
Author: rfrovarp
Date: Tue May 29 10:34:40 2007
New Revision: 542599
URL: http://svn.apache.org/viewvc?view=rev&rev=542599
Log:
Fixes hard coded HTTP, which causes problems when running through HTTPS (see bug 42100)
Modified:
lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js
lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx
Modified: lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js?view=diff&rev=542599&r1=542598&r2=542599
==============================================================================
--- lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js (original)
+++ lenya/trunk/src/modules/fckeditor/resources/javascript/fckloader.js Tue May 29 10:34:40 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-function fckloader(host, requesturi, contextPath)
+function fckloader(requesturi, contextPath)
{
var oFCKeditor = new FCKeditor( 'content' ) ;
oFCKeditor.BasePath = contextPath + '/modules/fckeditor/fckeditor/' ;
@@ -24,7 +24,6 @@
oFCKeditor.Config[ "FullPage" ] = true ;
oFCKeditor.Config[ "ProcessHTMLEntities" ] = true ;
oFCKeditor.Config[ "ProcessNumericEntities" ] = true ;
- oFCKeditor.Config[ "BaseHref" ] = host + requesturi ;
oFCKeditor.Config["CustomConfigurationsPath"] = contextPath + "/modules/fckeditor/javascript/fckconfig.js" ;
oFCKeditor.ToolbarSet = 'Lenya' ;
oFCKeditor.Config[ "ImageBrowserURL" ] = requesturi +'?lenya.usecase=fckeditor.insertImage' ;
Modified: lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx?view=diff&rev=542599&r1=542598&r2=542599
==============================================================================
--- lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx (original)
+++ lenya/trunk/src/modules/fckeditor/usecases/fckeditor.jx Tue May 29 10:34:40 2007
@@ -29,7 +29,7 @@
<script type="text/javascript">
window.onload = function()
{
- fckloader('${usecase.getParameter('host')}', '${usecase.getParameter('requesturi')}', '${request.getContextPath()}');
+ fckloader('${usecase.getParameter('requesturi')}', '${request.getContextPath()}');
}
</script>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org