From 48a577dec6eb2073b535a3cb26c7eb7ecc835d00 Mon Sep 17 00:00:00 2001
From: Tomasz Jakut <vepomoc@gmail.com>
Date: Wed, 17 Nov 2021 14:41:23 +0100
Subject: [PATCH] Revert "Merge pull request #4852 from ckeditor/t/4761"

This reverts commit 70649e5cd8b1afedba2aeb18017aed4e6227c911, reversing
changes made to 92173c63f7464b02985888bfeeb4ed80c89b4c94.
---
 CHANGES.md                             |   1 -
 core/config.js                         |   6 +-
 core/dom/document.js                   |   4 -
 core/tools.js                          |   7 +-
 tests/core/ckeditor/geturl.js          | 157 -------------------------
 tests/core/ckeditor/manual/geturl.html |  13 --
 tests/core/ckeditor/manual/geturl.md   |  10 --
 tests/core/dom/document.js             |  33 +-----
 tests/core/tools.js                    |  74 ------------
 9 files changed, 7 insertions(+), 298 deletions(-)
 delete mode 100644 tests/core/ckeditor/geturl.js
 delete mode 100644 tests/core/ckeditor/manual/geturl.html
 delete mode 100644 tests/core/ckeditor/manual/geturl.md

diff --git a/CHANGES.md b/CHANGES.md
index 7e2a81e5a0b..0391f148fd7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -60,7 +60,6 @@ API Changes:
 * [#4462](https://github.com/ckeditor/ckeditor4/issues/4462): [`CKEDITOR.editor#getSelection()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-getSelection) now returns `null` if the editor is in recreating state.
 * [#4583](https://github.com/ckeditor/ckeditor4/issues/4583): Added support for new, comma-less color syntax to [`CKEDITOR.tools.color`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_color.html).
 * [#4604](https://github.com/ckeditor/ckeditor4/issues/4604): Added the [`CKEDITOR.plugins.clipboard.dataTransfer#isFileTransfer()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_clipboard_dataTransfer.html#method-isFileTransfer) method.
-* [#4761](https://github.com/ckeditor/ckeditor4/issues/4761): [`CKEDITOR.dom.document#appendStyleSheet()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_document.html#method-appendStyleSheet) and [`CKEDITOR.tools.buildStyleHtml()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-buildStyleHtml) now use [`CKEDITOR.getUrl()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.html#method-getUrl) to correctly handle caching of CSS files.
 * [#4790](https://github.com/ckeditor/ckeditor4/issues/4790): Added `callback` parameter to [`CKEDITOR.plugins.preview#createPreview()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_preview.html#method-createPreview) method.
 
 Other Changes:
diff --git a/core/config.js b/core/config.js
index 7bf6e36f4f7..1ebc0535554 100644
--- a/core/config.js
+++ b/core/config.js
@@ -287,7 +287,7 @@ CKEDITOR.config = {
 	/**
 	 * The CSS file(s) to be used to apply style to editor content. It should
 	 * reflect the CSS used in the target pages where the content is to be
-	 * displayed. Every URL is passed through {@link CKEDITOR#getUrl} function.
+	 * displayed.
 	 *
 	 * **Note:** This configuration value is used only in {@glink guide/dev_framed `<iframe>`-based editor }
 	 * and ignored by {@glink guide/dev_inline inline editor}
@@ -301,9 +301,9 @@ CKEDITOR.config = {
 	 *		config.contentsCss = '/css/mysitestyles.css';
 	 *		config.contentsCss = [ '/css/mysitestyles.css', '/css/anotherfile.css' ];
 	 *
-	 * @cfg {String/Array} [contentsCss='contents.css']
+	 * @cfg {String/Array} [contentsCss=CKEDITOR.getUrl( 'contents.css' )]
 	 */
-	contentsCss: 'contents.css',
+	contentsCss: CKEDITOR.getUrl( 'contents.css' ),
 
 	/**
 	 * Comma-separated list of plugins to be used in an editor instance. Note that
diff --git a/core/dom/document.js b/core/dom/document.js
index ae61fdfe5bd..438b1fc8738 100644
--- a/core/dom/document.js
+++ b/core/dom/document.js
@@ -40,13 +40,9 @@ CKEDITOR.tools.extend( CKEDITOR.dom.document.prototype, {
 	 *
 	 *		CKEDITOR.document.appendStyleSheet( '/mystyles.css' );
 	 *
-	 * **Note:** URLs are passed through {@link CKEDITOR#getUrl} function.
-	 *
 	 * @param {String} cssFileUrl The CSS file URL.
 	 */
 	appendStyleSheet: function( cssFileUrl ) {
-		cssFileUrl = CKEDITOR.getUrl( cssFileUrl );
-
 		if ( this.$.createStyleSheet )
 			this.$.createStyleSheet( cssFileUrl );
 		else {
diff --git a/core/tools.js b/core/tools.js
index 0d6cddeeb59..4083a319f70 100644
--- a/core/tools.js
+++ b/core/tools.js
@@ -414,7 +414,7 @@
 		 * Builds a HTML snippet from a set of `<style>/<link>`.
 		 *
 		 * @param {String/Array} css Each of which are URLs (absolute) of a CSS file or
-		 * a trunk of style text. URLs are passed through {@link CKEDITOR#getUrl} function.
+		 * a trunk of style text.
 		 * @returns {String}
 		 */
 		buildStyleHtml: function( css ) {
@@ -426,11 +426,8 @@
 					// Is CSS style text ?
 					if ( /@import|[{}]/.test( item ) )
 						retval.push( '<style>' + item + '</style>' );
-					else {
-						item = CKEDITOR.getUrl( item );
-
+					else
 						retval.push( '<link type="text/css" rel=stylesheet href="' + item + '">' );
-					}
 				}
 			}
 			return retval.join( '' );
diff --git a/tests/core/ckeditor/geturl.js b/tests/core/ckeditor/geturl.js
deleted file mode 100644
index e1c3cc0bb46..00000000000
--- a/tests/core/ckeditor/geturl.js
+++ /dev/null
@@ -1,157 +0,0 @@
-/* bender-tags: editor */
-
-( function() {
-	'use strict';
-
-	var FAKE_BASE_PATH = 'http://some.example:1030/subdir/ckeditor/',
-		testCases = [
-			{
-				url: 'just.js',
-				expected: FAKE_BASE_PATH + 'just.js',
-				timestamp: ''
-			},
-
-			{
-				url: 'just.js',
-				expected: FAKE_BASE_PATH + 'just.js?t=347',
-				timestamp: '347'
-			},
-
-			{
-				url: './test.css',
-				expected: FAKE_BASE_PATH + './test.css',
-				timestamp: ''
-			},
-
-			{
-				url: './test.css',
-				expected: FAKE_BASE_PATH + './test.css?t=tr4',
-				timestamp: 'tr4'
-			},
-
-			{
-				url: '../whatever.js',
-				expected: FAKE_BASE_PATH + '../whatever.js',
-				timestamp: ''
-			},
-
-			{
-				url: '../whatever.js',
-				expected: FAKE_BASE_PATH + '../whatever.js?t=qwerty',
-				timestamp: 'qwerty'
-			},
-
-			{
-				url: '/file',
-				expected: '/file',
-				timestamp: ''
-			},
-
-			{
-				url: '/file',
-				expected: '/file?t=cke4',
-				timestamp: 'cke4'
-			},
-
-			{
-				url: 'http://some.site:47/file.js',
-				expected: 'http://some.site:47/file.js',
-				timestamp: ''
-			},
-
-			{
-				url: 'http://some.site:47/file.js',
-				expected: 'http://some.site:47/file.js?t=cv3',
-				timestamp: 'cv3'
-			},
-
-			{
-				url: 'https://whatever/file',
-				expected: 'https://whatever/file',
-				timestamp: ''
-			},
-
-			{
-				url: 'https://whatever/file',
-				expected: 'https://whatever/file?t=1er',
-				timestamp: '1er'
-			},
-
-			{
-				url: '//cksource.com/file.css',
-				expected: '//cksource.com/file.css',
-				timestamp: ''
-			},
-
-			{
-				url: '//cksource.com/file.css',
-				expected: '//cksource.com/file.css?t=try6',
-				timestamp: 'try6'
-			},
-
-			{
-				url: 'file.t?something=here',
-				expected: FAKE_BASE_PATH + 'file.t?something=here&t=wer',
-				timestamp: 'wer'
-			},
-
-			{
-				url: '/file.t?something=here',
-				expected: '/file.t?something=here&t=wer',
-				timestamp: 'wer'
-			},
-
-			{
-				url: 'http://dot.example/file.t?something=here',
-				expected: 'http://dot.example/file.t?something=here&t=wer',
-				timestamp: 'wer'
-			},
-
-			{
-				url: 'https://dot.example/file.t?something=here',
-				expected: 'https://dot.example/file.t?something=here&t=wer',
-				timestamp: 'wer'
-			},
-
-			{
-				url: '//dot.example/file.t?something=here',
-				expected: '//dot.example/file.t?something=here&t=wer',
-				timestamp: 'wer'
-			}
-		],
-		tests = createGetUrlTests( testCases );
-
-	bender.test( tests );
-
-	function createGetUrlTests( testCases ) {
-		return CKEDITOR.tools.array.reduce( testCases, function( tests, testCase ) {
-			var test = {},
-				testName = 'test CKEDITOR.getUrl( \'' + testCase.url + '\' ) with timestamp \'' +
-					testCase.timestamp + '\'';
-
-			test[ testName ] = createTest( testCase );
-
-			return CKEDITOR.tools.object.merge( tests, test );
-		}, {} );
-
-		function createTest( options ) {
-			var url = options.url,
-				expected = options.expected,
-				timestamp = options.timestamp;
-
-			return function() {
-				var originalBasePath = CKEDITOR.basePath,
-					originalTimestamp = CKEDITOR.timestamp,
-					actualResult;
-
-				CKEDITOR.basePath = FAKE_BASE_PATH;
-				CKEDITOR.timestamp = timestamp;
-				actualResult = CKEDITOR.getUrl( url );
-				CKEDITOR.basePath = originalBasePath;
-				CKEDITOR.timestamp = originalTimestamp;
-
-				assert.areSame( expected, actualResult, 'Invalid URL generated from the ' + url );
-			};
-		}
-	}
-} )();
diff --git a/tests/core/ckeditor/manual/geturl.html b/tests/core/ckeditor/manual/geturl.html
deleted file mode 100644
index 9f5e949023f..00000000000
--- a/tests/core/ckeditor/manual/geturl.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="editor">
-	<p>Lorem ipsum dolor sit amet</p>
-</div>
-
-<script>
-	( function() {
-		if ( bender.tools.env.mobile || !CKEDITOR.timestamp ) {
-			return bender.ignore();
-		}
-
-		CKEDITOR.replace( 'editor' );
-	} )();
-</script>
diff --git a/tests/core/ckeditor/manual/geturl.md b/tests/core/ckeditor/manual/geturl.md
deleted file mode 100644
index 012c9036175..00000000000
--- a/tests/core/ckeditor/manual/geturl.md
+++ /dev/null
@@ -1,10 +0,0 @@
-@bender-tags: bug, 4.17.0, 4761
-@bender-ui: collapsed
-@bender-ckeditor-plugins: wysiwygarea, toolbar, undo, emoji, copyformatting, easyimage, tableselection
-
-**Note**: This test requires CKEDITOR with set `CKEDITOR.timestamp` (e.g. built one).
-
-1. Open developer tools and switch to "Network" tab.
-2. Refresh the page.
-
-	**Expected** CKEditor 4's resources are loaded with the cache key (`?t=<some alphanum characters>` at the end of URL).
diff --git a/tests/core/dom/document.js b/tests/core/dom/document.js
index 91e869fcee6..7a164ba7ea9 100644
--- a/tests/core/dom/document.js
+++ b/tests/core/dom/document.js
@@ -15,12 +15,8 @@ bender.test( appendDomObjectTests(
 			assert.areSame( document, doc.$ );
 		},
 
-		// (#4761)
-		test_appendStyleSheet_notimestamp: function() {
-			var originalTimestamp = CKEDITOR.timestamp,
-				cssUrl = CKEDITOR.basePath + 'tests/_assets/sample.css';
-
-			CKEDITOR.timestamp = '';
+		test_appendStyleSheet: function() {
+			var cssUrl = CKEDITOR.basePath + 'tests/_assets/sample.css';
 
 			var doc = new CKEDITOR.dom.document( document );
 			doc.appendStyleSheet( cssUrl );
@@ -34,31 +30,6 @@ bender.test( appendDomObjectTests(
 				}
 			}
 
-			CKEDITOR.timestamp = originalTimestamp;
-			assert.isTrue( succeed, 'The link element was not found' );
-		},
-
-		// (#4761)
-		test_appendStyleSheet_timestamp: function() {
-			var originalTimestamp = CKEDITOR.timestamp,
-				cssUrl = CKEDITOR.basePath + 'tests/_assets/sample.css',
-				expectedUrl = cssUrl + '?t=wer56';
-
-			CKEDITOR.timestamp = 'wer56';
-
-			var doc = new CKEDITOR.dom.document( document );
-			doc.appendStyleSheet( cssUrl );
-
-			var links = document.getElementsByTagName( 'link' );
-			var succeed = false;
-			for ( var i = 0 ; i < links.length ; i++ ) {
-				if ( links[ i ].href == expectedUrl ) {
-					succeed = true;
-					break;
-				}
-			}
-
-			CKEDITOR.timestamp = originalTimestamp;
 			assert.isTrue( succeed, 'The link element was not found' );
 		},
 
diff --git a/tests/core/tools.js b/tests/core/tools.js
index a1c2381256e..0aa0a86c302 100644
--- a/tests/core/tools.js
+++ b/tests/core/tools.js
@@ -1177,80 +1177,6 @@
 			assert.areSame( 2, testSpy.callCount );
 			assert.areSame( testObj, testSpy.getCall( 0 ).thisValue );
 			assert.isTrue( testSpy.calledWithExactly( 'baz', 100, 'bar' ) );
-		},
-
-		// (#4761)
-		'test buildStyleHtml with no timestamp returns stylesheet URL without cache key for passed string': function() {
-			var originalTimestamp = CKEDITOR.timestamp,
-				url = '/file.css',
-				expectedHref = 'href="' + url + '"',
-				html;
-
-			CKEDITOR.timestamp = '';
-			html = CKEDITOR.tools.buildStyleHtml( url ),
-			CKEDITOR.timestamp = originalTimestamp;
-
-			assert.areNotSame( -1, html.indexOf( expectedHref ), 'Built HTML includes correct stylesheet link' );
-		},
-
-		// (#4761)
-		'test buildStyleHtml with set timestamp returns stylesheet URL with cache key for passed string': function() {
-			var originalTimestamp = CKEDITOR.timestamp,
-				newTimestamp = 'wer55',
-				url = '/file.css',
-				expectedHref = 'href="' + url + '?t=' + newTimestamp + '"',
-				html;
-
-			CKEDITOR.timestamp = newTimestamp;
-			html = CKEDITOR.tools.buildStyleHtml( url ),
-			CKEDITOR.timestamp = originalTimestamp;
-
-			assert.areNotSame( -1, html.indexOf( expectedHref ), 'Built HTML includes correct stylesheet link' );
-		},
-
-		// (#4761)
-		'test buildStyleHtml with no timestamp returns stylesheet URLs without cache key for passed array': function() {
-			var originalTimestamp = CKEDITOR.timestamp,
-				urls = [
-					'/file.css',
-					'/some-other-file'
-				],
-				expectedHrefs = [
-					'href="' + urls[ 0 ] + '"',
-					'href="' + urls[ 1 ] + '"'
-				],
-				html;
-
-			CKEDITOR.timestamp = '';
-			html = CKEDITOR.tools.buildStyleHtml( urls ),
-			CKEDITOR.timestamp = originalTimestamp;
-
-			CKEDITOR.tools.array.forEach( expectedHrefs, function( expectedHref ) {
-				assert.areNotSame( -1, html.indexOf( expectedHref ), 'Built HTML includes correct stylesheet link' );
-			} );
-		},
-
-		// (#4761)
-		'test buildStyleHtml with set timestamp returns stylesheet URLs with cache key for passed array': function() {
-			var originalTimestamp = CKEDITOR.timestamp,
-				newTimestamp = 'wer55',
-				urls = [
-					'/file.css',
-					'/some-other-file'
-				],
-				expectedHrefs = [
-					'href="' + urls[ 0 ] + '?t=' + newTimestamp + '"',
-					'href="' + urls[ 1 ] + '?t=' + newTimestamp + '"'
-				],
-				html;
-
-			CKEDITOR.timestamp = newTimestamp;
-			html = CKEDITOR.tools.buildStyleHtml( urls ),
-			CKEDITOR.timestamp = originalTimestamp;
-
-			CKEDITOR.tools.array.forEach( expectedHrefs, function( expectedHref ) {
-				assert.areNotSame( -1, html.indexOf( expectedHref ), 'Built HTML includes correct stylesheet link' );
-			} );
 		}
 	} );
 } )();