Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 7412)
+++ /CKEditor/trunk/CHANGES.html (revision 7413)
@@ -79,4 +79,5 @@
#8540 : Fix malformed HTML list/table with text directly inside of it.
#8774 : Fix entities plugin to allow it to be configured to only output XML entities.
+ #8602 : Image src is now properly hidden when running data through the data processor.
Index: /CKEditor/trunk/_source/core/ckeditor_base.js
===================================================================
--- /CKEditor/trunk/_source/core/ckeditor_base.js (revision 7412)
+++ /CKEditor/trunk/_source/core/ckeditor_base.js (revision 7413)
@@ -13,5 +13,5 @@
// ckeditor_source.js and ckeditor_basic_source.js files.
-// if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'',version:'%VERSION%',rev:'%REV%',_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f=0?'&':'?')+('t=')+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();
+// if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'',version:'%VERSION%',revision:'%REV%',rdn:Math.floor(Math.random()*900)+100,_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f=0?'&':'?')+'t='+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();
// #### Raw code
@@ -74,4 +74,12 @@
*/
revision : '%REV%',
+
+ /**
+ * A 3-digit random integer, valid for the entire life of the CKEDITOR object.
+ * @type Number
+ * @example
+ * alert( CKEDITOR.rnd ); // e.g. '319'
+ */
+ rdn : Math.floor( Math.random() * ( 999/*Max*/ - 100/*Min*/ + 1 ) ) + 100/*Min*/,
/**
Index: /CKEditor/trunk/_source/plugins/htmldataprocessor/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/htmldataprocessor/plugin.js (revision 7412)
+++ /CKEditor/trunk/_source/plugins/htmldataprocessor/plugin.js (revision 7413)
@@ -309,5 +309,5 @@
// We should not rewrite the existed protected attributes, e.g. clipboard content from editor. (#5218)
if ( !( /^on/ ).test( attrName ) && attributes.indexOf( 'data-cke-saved-' + attrName ) == -1 )
- return ' data-cke-saved-' + fullAttr + ' ' + fullAttr;
+ return ' data-cke-saved-' + fullAttr + ' data-cke-' + CKEDITOR.rdn + '-' + fullAttr;
return fullAttr;
@@ -518,14 +518,10 @@
var div = new CKEDITOR.dom.element( 'div' );
- // Prevent execution of event handlers in the div (#8630)
- var prefix = 'data-cke' + CKEDITOR.tools.getNextNumber() + '-';
- data = data.replace( /(\s)(on)/ig, '$1' + prefix + '$2' );
-
// Add fake character to workaround IE comments bug. (#3801)
div.setHtml( 'a' + data );
data = div.getHtml().substr( 1 );
- // Restore event handlers (#8630)
- data = data.replace( new RegExp( prefix, 'gi' ), '' );
+ // Restore shortly protected attribute names.
+ data = data.replace( new RegExp( ' data-cke-' + CKEDITOR.rdn + '-', 'ig' ), '' );
// Unprotect "some" of the protected elements at this point.
Index: /CKEditor/trunk/ckeditor_basic_source.js
===================================================================
--- /CKEditor/trunk/ckeditor_basic_source.js (revision 7412)
+++ /CKEditor/trunk/ckeditor_basic_source.js (revision 7413)
@@ -6,5 +6,5 @@
// Compressed version of core/ckeditor_base.js. See original for instructions.
/*jsl:ignore*/
-if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'',version:'%VERSION%',revision:'%REV%',_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f=0?'&':'?')+('t=')+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();
+if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'',version:'%VERSION%',revision:'%REV%',rdn:Math.floor(Math.random()*900)+100,_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f=0?'&':'?')+'t='+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();
/*jsl:end*/
Index: /CKEditor/trunk/ckeditor_source.js
===================================================================
--- /CKEditor/trunk/ckeditor_source.js (revision 7412)
+++ /CKEditor/trunk/ckeditor_source.js (revision 7413)
@@ -6,5 +6,5 @@
// Compressed version of core/ckeditor_base.js. See original for instructions.
/*jsl:ignore*/
-if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'',version:'%VERSION%',revision:'%REV%',_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f=0?'&':'?')+('t=')+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();
+if(!window.CKEDITOR)window.CKEDITOR=(function(){var a={timestamp:'',version:'%VERSION%',revision:'%REV%',rdn:Math.floor(Math.random()*900)+100,_:{},status:'unloaded',basePath:(function(){var d=window.CKEDITOR_BASEPATH||'';if(!d){var e=document.getElementsByTagName('script');for(var f=0;f=0?'&':'?')+'t='+this.timestamp;return d;}},b=window.CKEDITOR_GETURL;if(b){var c=a.getUrl;a.getUrl=function(d){return b.call(a,d)||c.call(a,d);};}return a;})();
/*jsl:end*/