Hi Richard, [EMAIL PROTECTED] schrieb: > Author: rfrovarp > Date: Thu Jun 28 06:44:26 2007 > New Revision: 551554 > > URL: http://svn.apache.org/viewvc?view=rev&rev=551554 > Log: > Apply Proxy fixes for TinyMCE and FCKeditor insertAsset functionality - > updates from r551545
thanks for this! Maybe we can find a way to use the same code for BXE and FCKeditor, maybe by extracting some parts of the file to a separate JX template? -- Andreas > > Modified: > lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx > lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx > > Modified: lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx > URL: > http://svn.apache.org/viewvc/lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx?view=diff&rev=551554&r1=551553&r2=551554 > ============================================================================== > --- lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx (original) > +++ lenya/trunk/src/modules/fckeditor/usecases/insertAsset.jx Thu Jun 28 > 06:44:26 2007 > @@ -48,15 +48,13 @@ > <th style="background: none;"><i18n:text>Dimension (w x > h)</i18n:text></th> > <th style="background: none;"><i18n:text>Creation > Date</i18n:text></th> > </tr> > + <jx:set var="asset2proxyUrl" > value="${usecase.getParameter('asset2proxyUrl')}"/> > <jx:forEach var="asset" > items="${usecase.getParameter('assets')}"> > - <jx:set var="originalUrl" > value="${asset.getCanonicalWebappURL()}"/> > - <jx:set var="lastDotIndex" > value="${originalUrl.lastIndexOf('.')}"/> > - <jx:set var="extension" > value="${asset.getMetaData('http://apache.org/lenya/metadata/document/1.0').getFirstValue('extension')}"/> > - <jx:set var="url" value="${originalUrl.substring(0, > lastDotIndex).concat('.').concat(extension)}"/> > + <jx:set var="url" value="${asset2proxyUrl.get(asset)}"/> > <tr> > <td> > <input type="radio" name="asset" > value="${asset.getPath()}" > - onClick="javascript:insertData('${url}', > '${asset.getMetaData('http://purl.org/dc/elements/1.1/').getFirstValue('title')}', > '${asset.getMimeType()}', '${asset.getContentLength() / 1000}', > '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('height')}', > > '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('width')}')"/> > > + onClick="insertData('${url}', > '${asset.getMetaData('http://purl.org/dc/elements/1.1/').getFirstValue('title')}', > '${asset.getMimeType()}', '${asset.getContentLength() / 1000}', > '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('height')}', > > '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('width')}')"/> > > </td> > <td><jx:out value="${asset.getPath()}"/></td> > <td> > > Modified: lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx > URL: > http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx?view=diff&rev=551554&r1=551553&r2=551554 > ============================================================================== > --- lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx (original) > +++ lenya/trunk/src/modules/tinymce/usecases/insertAsset.jx Thu Jun 28 > 06:44:26 2007 > @@ -48,15 +48,13 @@ > <th style="background: none;"><i18n:text>Dimension (w x > h)</i18n:text></th> > <th style="background: none;"><i18n:text>Creation > Date</i18n:text></th> > </tr> > + <jx:set var="asset2proxyUrl" > value="${usecase.getParameter('asset2proxyUrl')}"/> > <jx:forEach var="asset" > items="${usecase.getParameter('assets')}"> > - <jx:set var="originalUrl" > value="${asset.getCanonicalWebappURL()}"/> > - <jx:set var="lastDotIndex" > value="${originalUrl.lastIndexOf('.')}"/> > - <jx:set var="extension" > value="${asset.getMetaData('http://apache.org/lenya/metadata/document/1.0').getFirstValue('extension')}"/> > - <jx:set var="url" value="${originalUrl.substring(0, > lastDotIndex).concat('.').concat(extension)}"/> > + <jx:set var="url" value="${asset2proxyUrl.get(asset)}"/> > <tr> > <td> > <input type="radio" name="asset" > value="${asset.getPath()}" > - onClick="javascript:insertData('${url}', > '${asset.getMetaData('http://purl.org/dc/elements/1.1/').getFirstValue('title')}', > '${asset.getMimeType()}', '${asset.getContentLength() / 1000}', > '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('height')}', > > '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('width')}')"/> > > + onClick="insertData('${url}', > '${asset.getMetaData('http://purl.org/dc/elements/1.1/').getFirstValue('title')}', > '${asset.getMimeType()}', '${asset.getContentLength() / 1000}', > '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('height')}', > > '${asset.getMetaData('http://apache.org/lenya/metadata/media/1.0').getFirstValue('width')}')"/> > > </td> > <td><jx:out value="${asset.getPath()}"/></td> > <td> -- Andreas Hartmann, CTO BeCompany GmbH http://www.becompany.ch --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
