Author: sdumitriu
Date: 2007-12-12 18:01:23 +0100 (Wed, 12 Dec 2007)
New Revision: 6359
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/tiny_mce/themes/wikieditor/attachment.htm
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/tiny_mce/themes/wikieditor/image.htm
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/tiny_mce/themes/wikieditor/attachment.htm
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/tiny_mce/themes/wikieditor/image.htm
xwiki-platform/web/trunk/standard/src/main/webapp/tiny_mce/themes/wikieditor/attachment.htm
xwiki-platform/web/trunk/standard/src/main/webapp/tiny_mce/themes/wikieditor/image.htm
Log:
XWIKI-1946: Attachment renaming in the WYSiWYG doesn't keep the file extension
Fixed.
Patch submitted by Raluca Morosan, applied with minor changes.
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/tiny_mce/themes/wikieditor/attachment.htm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/tiny_mce/themes/wikieditor/attachment.htm
2007-12-12 16:35:10 UTC (rev 6358)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/tiny_mce/themes/wikieditor/attachment.htm
2007-12-12 17:01:23 UTC (rev 6359)
@@ -101,8 +101,14 @@
if (form.filename.value==fname)
return true;
- if (form.filename.value=="")
- form.filename.value = fname;
+ if (form.filename.value=="") {
+ form.filename.value = fname;
+ } else {
+ if(form.filename.value.lastIndexOf('.') < 0){
+ var extension = fname.substr(fname.lastIndexOf('.'),
fname.length - fname.lastIndexOf('.'));
+ form.filename.value += extension;
+ }
+ }
return true;
}
Modified:
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/tiny_mce/themes/wikieditor/image.htm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/tiny_mce/themes/wikieditor/image.htm
2007-12-12 16:35:10 UTC (rev 6358)
+++
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/tiny_mce/themes/wikieditor/image.htm
2007-12-12 17:01:23 UTC (rev 6359)
@@ -83,8 +83,14 @@
if (form.filename.value==fname)
return true;
- if (form.filename.value=="")
- form.filename.value = fname;
+ if (form.filename.value=="") {
+ form.filename.value = fname;
+ } else {
+ if(form.filename.value.lastIndexOf('.') < 0){
+ var extension = fname.substr(fname.lastIndexOf('.'),
fname.length - fname.lastIndexOf('.'));
+ form.filename.value += extension;
+ }
+ }
return true;
}
</script>
Modified:
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/tiny_mce/themes/wikieditor/attachment.htm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/tiny_mce/themes/wikieditor/attachment.htm
2007-12-12 16:35:10 UTC (rev 6358)
+++
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/tiny_mce/themes/wikieditor/attachment.htm
2007-12-12 17:01:23 UTC (rev 6359)
@@ -101,8 +101,14 @@
if (form.filename.value==fname)
return true;
- if (form.filename.value=="")
- form.filename.value = fname;
+ if (form.filename.value=="") {
+ form.filename.value = fname;
+ } else {
+ if(form.filename.value.lastIndexOf('.') < 0){
+ var extension = fname.substr(fname.lastIndexOf('.'),
fname.length - fname.lastIndexOf('.'));
+ form.filename.value += extension;
+ }
+ }
return true;
}
Modified:
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/tiny_mce/themes/wikieditor/image.htm
===================================================================
---
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/tiny_mce/themes/wikieditor/image.htm
2007-12-12 16:35:10 UTC (rev 6358)
+++
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/tiny_mce/themes/wikieditor/image.htm
2007-12-12 17:01:23 UTC (rev 6359)
@@ -83,8 +83,14 @@
if (form.filename.value==fname)
return true;
- if (form.filename.value=="")
- form.filename.value = fname;
+ if (form.filename.value=="") {
+ form.filename.value = fname;
+ } else {
+ if(form.filename.value.lastIndexOf('.') < 0){
+ var extension = fname.substr(fname.lastIndexOf('.'),
fname.length - fname.lastIndexOf('.'));
+ form.filename.value += extension;
+ }
+ }
return true;
}
</script>
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/tiny_mce/themes/wikieditor/attachment.htm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/tiny_mce/themes/wikieditor/attachment.htm
2007-12-12 16:35:10 UTC (rev 6358)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/tiny_mce/themes/wikieditor/attachment.htm
2007-12-12 17:01:23 UTC (rev 6359)
@@ -101,8 +101,14 @@
if (form.filename.value==fname)
return true;
- if (form.filename.value=="")
- form.filename.value = fname;
+ if (form.filename.value=="") {
+ form.filename.value = fname;
+ } else {
+ if(form.filename.value.lastIndexOf('.') < 0){
+ var extension = fname.substr(fname.lastIndexOf('.'),
fname.length - fname.lastIndexOf('.'));
+ form.filename.value += extension;
+ }
+ }
return true;
}
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/tiny_mce/themes/wikieditor/image.htm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/tiny_mce/themes/wikieditor/image.htm
2007-12-12 16:35:10 UTC (rev 6358)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/tiny_mce/themes/wikieditor/image.htm
2007-12-12 17:01:23 UTC (rev 6359)
@@ -83,8 +83,14 @@
if (form.filename.value==fname)
return true;
- if (form.filename.value=="")
- form.filename.value = fname;
+ if (form.filename.value=="") {
+ form.filename.value = fname;
+ } else {
+ if(form.filename.value.lastIndexOf('.') < 0){
+ var extension = fname.substr(fname.lastIndexOf('.'),
fname.length - fname.lastIndexOf('.'));
+ form.filename.value += extension;
+ }
+ }
return true;
}
</script>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
