CSP: change another inline script so that it can be allowed as script…

…-src via hash + remove some unnecessary spaces
CoreMedia · Feb 17, 2016 · fb93930 · fb93930
1 parent e8e31dd
commit fb93930
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/...src/main/resources/META-INF/resources/ckeditor/_source/plugins/clipboard/dialogs/paste.js b/...src/main/resources/META-INF/resources/ckeditor/_source/plugins/clipboard/dialogs/paste.js
@@ -143,8 +143,14 @@ CKEDITOR.dialog.add( 'paste', function( editor ) {
 						var htmlToLoad = '<html dir="' + editor.config.contentsLangDirection + '"' +
 							' lang="' + ( editor.config.contentsLanguage || editor.langCode ) + '">' +
 							'<head><style>body{margin:3px;height:95%;word-break:break-all;}</style></head><body>' +
-							'<script id="cke_actscrpt" type="text/javascript">' +
-							'window.parent.CKEDITOR.tools.callFunction(' + CKEDITOR.tools.addFunction( onPasteFrameLoad, dialog ) + ',this);' +
+							'<script id="cke_actscrpt" type="text/javascript" ' +
+							' data-frameloadedhandler="' + CKEDITOR.tools.addFunction( onPasteFrameLoad, dialog ) + '">' +
+							' var currentScript = document.currentScript || (function () {' +
+							' var scripts = document.getElementsByTagName("script");' +
+							' return scripts[scripts.length - 1];' +
+							' })();' +
+							' var frameLoadedHandler = currentScript.getAttribute("data-frameloadedhandler");' +
+							' window.parent.CKEDITOR.tools.callFunction( frameLoadedHandler, this );' +
 							'</script></body>' +
 							'</html>';
 

diff --git a/...tor4/src/main/resources/META-INF/resources/ckeditor/_source/plugins/wysiwygarea/plugin.js b/...tor4/src/main/resources/META-INF/resources/ckeditor/_source/plugins/wysiwygarea/plugin.js
@@ -433,17 +433,17 @@
 						'<script id="cke_actscrpt" type="text/javascript"' +
 						' data-frameloadedhandler="' + this._.frameLoadedHandler +
 						'"' + ( CKEDITOR.env.ie ? ' defer="defer" ' : '' ) + ' />' +
-							'var wasLoaded = 0;' +
-							'function onload() {' +
-							'	if (!wasLoaded) {' +
-							'		var currentScript = document.currentScript || (function () {' +
-							'				var scripts = document.getElementsByTagName("script");' +
-							'				return scripts[scripts.length - 1];' +
-							'			})();' +
-							'		var frameLoadedHandler = currentScript.getAttribute("data-frameloadedhandler");' +
-							'		window.parent.CKEDITOR.tools.callFunction(frameLoadedHandler, window);' +
-							'	}' +
-							'	wasLoaded = 1;' +
+							' var wasLoaded = 0;' +
+							' function onload() {' +
+							' if (!wasLoaded) {' +
+							' var currentScript = document.currentScript || (function () {' +
+							' var scripts = document.getElementsByTagName("script");' +
+							' return scripts[scripts.length - 1];' +
+							' })();' +
+							' var frameLoadedHandler = currentScript.getAttribute("data-frameloadedhandler");' +
+							' window.parent.CKEDITOR.tools.callFunction(frameLoadedHandler, window);' +
+							' }' +
+							' wasLoaded = 1;' +
 							'}' +
 						   ( CKEDITOR.env.ie ? 'onload();' : 'document.addEventListener("DOMContentLoaded", onload, false);' ) +
 						'</script>';