D265.id.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: branches/5.2.x/core/ckeditor/plugins/my_document/dialogs/document.js
	===================================================================
	--- branches/5.2.x/core/ckeditor/plugins/my_document/dialogs/document.js
	+++ branches/5.2.x/core/ckeditor/plugins/my_document/dialogs/document.js
	@@ -18,6 +18,17 @@
	}
	};

	+ var makeRelativeUrl = function ($url) {
	+ if ( $url.indexOf(':/') == -1 && path.slice(0, 2) != '//' ) {
	+ return $url;
	+ }
	+
	+ var $link = document.createElement('a');
	+
	+ $link.href = $url;
	+
	+ return $link.pathname;
	+ };

	var parseLink = function( editor ) {
	var retval = {
	@@ -343,7 +354,7 @@
	this.commitContent( data );

	var $filename = data.documentUrl.slice(data.documentUrl.lastIndexOf('\/') + 1);
	- var $icon_url = CKEDITOR.basePath.split('/');
	+ var $icon_url = makeRelativeUrl(CKEDITOR.basePath).split('/');

	$icon_url.splice($icon_url.length - 3); // remove "/core/ckeditor/"
	$icon_url = $icon_url.join('/') + editor.config.documentIconsUrl;
	@@ -371,4 +382,4 @@

	};
	}
	-);
	\ No newline at end of file
	+);