Merge branch 't/9940'

Author: fredck

CHANGES.md

@@ -15,6 +15,7 @@ CKEditor 4 Changelog
 * [#9893](http://dev.ckeditor.com/ticket/9893): Fixed broken toolbar when editing mixed-dir content in quirks mode.
 * [#9845](http://dev.ckeditor.com/ticket/9845): Fixed TAB navigation in the Link dialog and the Anchors option is used and no anchors are available.
 * [#9883](http://dev.ckeditor.com/ticket/9883): Maximizing was making the entire page editable with divarea based editors.
+* [#9940](http://dev.ckeditor.com/ticket/9940): With Firefox, navigating back to a page with the editor was making the entire page editable.
 
 ## CKEditor 4.0.1
 

plugins/wysiwygarea/plugin.js

@@ -508,30 +508,6 @@
 		}
 	});
 
-	// Fixing Firefox 'Back-Forward Cache' breaks design mode. (#4514)
-	if ( CKEDITOR.env.gecko ) {
-		(function() {
-			var body = document.body;
-
-			if ( !body )
-				window.addEventListener( 'load', arguments.callee, false );
-			else {
-				var currentHandler = body.getAttribute( 'onpageshow' );
-				body.setAttribute( 'onpageshow', ( currentHandler ? currentHandler + ';' : '' ) + 'event.persisted&&(function(){' +
-					'var x=CKEDITOR.instances,d,i;' +
-					'for(i in x){' +
-						'd=x[i].document;' +
-						'if(d){' +
-							'd.$.designMode="off";' +
-							'd.$.designMode="on";' +
-						'}' +
-					'}' +
-					'})();' );
-			}
-		})();
-
-	}
-
 	// DOM modification here should not bother dirty flag.(#4385)
 	function restoreDirty( editor ) {
 		if ( !editor.checkDirty() )