diff --git a/media/com_contact/js/admin-contacts-modal.js b/media/com_contact/js/admin-contacts-modal.js
index aaed499b97020..a085647f509d8 100644
--- a/media/com_contact/js/admin-contacts-modal.js
+++ b/media/com_contact/js/admin-contacts-modal.js
@@ -17,7 +17,7 @@
 
 		if (!Joomla.getOptions('xtd-contacts')) {
 			// Something went wrong!
-			window.parent.jModalClose();
+			window.parent.Joomla.UI.Modal.close();
 			return false;
 		}
 
@@ -30,7 +30,7 @@
 		tag = '<a' + hreflang + ' href="' + link + '">' + title + '</a>';
 
 		window.parent.Joomla.editors.instances[editor].replaceSelection(tag);
-		window.parent.jModalClose();
+		window.parent.Joomla.UI.Modal.close();
 	};
 
 	document.addEventListener('DOMContentLoaded', function(){
diff --git a/media/com_contact/js/admin-contacts-modal.min.js b/media/com_contact/js/admin-contacts-modal.min.js
index 4f4b864981511..8f6cb6895fc71 100644
--- a/media/com_contact/js/admin-contacts-modal.min.js
+++ b/media/com_contact/js/admin-contacts-modal.min.js
@@ -1 +1 @@
-!function(){"use strict";window.jSelectContact=function(a,b,c,d,e,f){var g,h,i="";if(!Joomla.getOptions("xtd-contacts"))return window.parent.jModalClose(),!1;h=Joomla.getOptions("xtd-contacts").editor,""!==f&&(i=' hreflang = "'+f+'"'),g="<a"+i+' href="'+e+'">'+b+"</a>",window.parent.Joomla.editors.instances[h].replaceSelection(g),window.parent.jModalClose()},document.addEventListener("DOMContentLoaded",function(){for(var a=document.querySelectorAll(".select-link"),b=0,c=a.length;c>b;b++)a[b].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-function");"jSelectContact"===b?window[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),null,null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"),null):window.parent[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),null,null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"),null)})})}();
\ No newline at end of file
+!function(){"use strict";window.jSelectContact=function(a,b,c,d,e,f){var g,h,i="";return Joomla.getOptions("xtd-contacts")?(h=Joomla.getOptions("xtd-contacts").editor,""!==f&&(i=' hreflang = "'+f+'"'),g="<a"+i+' href="'+e+'">'+b+"</a>",window.parent.Joomla.editors.instances[h].replaceSelection(g),void window.parent.Joomla.UI.Modal.close()):(window.parent.Joomla.UI.Modal.close(),!1)},document.addEventListener("DOMContentLoaded",function(){for(var a=document.querySelectorAll(".select-link"),b=0,c=a.length;c>b;b++)a[b].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-function");"jSelectContact"===b?window[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),null,null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"),null):window.parent[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),null,null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"),null)})})}();
\ No newline at end of file
diff --git a/media/com_content/js/admin-article-pagebreak.js b/media/com_content/js/admin-article-pagebreak.js
index b58b93d74a151..498780cf9fa5e 100644
--- a/media/com_content/js/admin-article-pagebreak.js
+++ b/media/com_content/js/admin-article-pagebreak.js
@@ -11,7 +11,7 @@
 
 		if (!window.parent.Joomla.getOptions('xtd-pagebreak')) {
 			// Something went wrong!
-			window.parent.jModalClose();
+			window.parent.Joomla.UI.Modal.close();
 			return false;
 		}
 
@@ -25,7 +25,7 @@
 		tag = '<hr class="system-pagebreak" ' + title + ' ' + alt + '/>';
 
 		window.parent.Joomla.editors.instances[editor].replaceSelection(tag);
-		window.parent.jModalClose();
+		window.parent.Joomla.UI.Modal.close();
 		return false;
 	};
 })();
diff --git a/media/com_content/js/admin-article-pagebreak.min.js b/media/com_content/js/admin-article-pagebreak.min.js
index a481a4ac93547..cb88703e9bcb0 100644
--- a/media/com_content/js/admin-article-pagebreak.min.js
+++ b/media/com_content/js/admin-article-pagebreak.min.js
@@ -1 +1 @@
-!function(){"use strict";window.insertPagebreak=function(a){var b,c,d=document.getElementById("title").value;return window.parent.Joomla.getOptions("xtd-pagebreak")?(b=document.getElementById("alt").value,d=""!=d?'title="'+d+'"':"",b=""!=b?'alt="'+b+'"':"",c='<hr class="system-pagebreak" '+d+" "+b+"/>",window.parent.Joomla.editors.instances[a].replaceSelection(c),window.parent.jModalClose(),!1):(window.parent.jModalClose(),!1)}}();
\ No newline at end of file
+!function(){"use strict";window.insertPagebreak=function(a){var b,c,d=document.getElementById("title").value;return window.parent.Joomla.getOptions("xtd-pagebreak")?(b=document.getElementById("alt").value,d=""!=d?'title="'+d+'"':"",b=""!=b?'alt="'+b+'"':"",c='<hr class="system-pagebreak" '+d+" "+b+"/>",window.parent.Joomla.editors.instances[a].replaceSelection(c),window.parent.Joomla.UI.Modal.close(),!1):(window.parent.Joomla.UI.Modal.close(),!1)}}();
\ No newline at end of file
diff --git a/media/com_content/js/admin-article-readmore.min.js b/media/com_content/js/admin-article-readmore.min.js
index 66499bed187f9..30db892f1ebd4 100644
--- a/media/com_content/js/admin-article-readmore.min.js
+++ b/media/com_content/js/admin-article-readmore.min.js
@@ -1 +1 @@
-window.insertReadmore=function(a){"use strict";if(!Joomla.getOptions("xtd-readmore"))return!1;var b,c=window.parent.Joomla.getOptions("xtd-readmore");if(b=window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(a)?window.parent.Joomla.editors.instances[a].getValue():new Function("return "+c.editor)(),b.match(/<hr\s+id=("|')system-readmore("|')\s*\/*>/i))return alert(c.exists),!1;Joomla.editors.instances[a].replaceSelection('<hr id="system-readmore" />')};
\ No newline at end of file
+window.insertReadmore=function(a){"use strict";if(!Joomla.getOptions("xtd-readmore"))return!1;var b,c=window.parent.Joomla.getOptions("xtd-readmore");return b=window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(a)?window.parent.Joomla.editors.instances[a].getValue():new Function("return "+c.editor)(),b.match(/<hr\s+id=("|')system-readmore("|')\s*\/*>/i)?(alert(c.exists),!1):void Joomla.editors.instances[a].replaceSelection('<hr id="system-readmore" />')};
\ No newline at end of file
diff --git a/media/com_content/js/admin-articles-modal.js b/media/com_content/js/admin-articles-modal.js
index b262d1fb02d97..6a7665e238225 100644
--- a/media/com_content/js/admin-articles-modal.js
+++ b/media/com_content/js/admin-articles-modal.js
@@ -15,7 +15,7 @@
 
 		if (!Joomla.getOptions('xtd-articles')) {
 			// Something went wrong!
-			window.parent.jModalClose();
+			window.parent.Joomla.UI.Modal.close();
 			return false;
 		}
 
@@ -29,7 +29,7 @@
 		tag = '<a' + hreflang + ' href="' + link + '">' + title + '</a>';
 
 		window.parent.Joomla.editors.instances[editor].replaceSelection(tag);
-		window.parent.jModalClose();
+		window.parent.Joomla.UI.Modal.close();
 	};
 
 	document.addEventListener('DOMContentLoaded', function(){
diff --git a/media/com_content/js/admin-articles-modal.min.js b/media/com_content/js/admin-articles-modal.min.js
index 25cc8fa1f2efc..9728d80ad3bc8 100644
--- a/media/com_content/js/admin-articles-modal.min.js
+++ b/media/com_content/js/admin-articles-modal.min.js
@@ -1 +1 @@
-!function(){"use strict";window.jSelectArticle=function(a,b,c,d,e,f){var g,h,i="";if(!Joomla.getOptions("xtd-articles"))return window.parent.jModalClose(),!1;g=Joomla.getOptions("xtd-articles").editor,""!==f&&(i=' hreflang="'+f+'"'),h="<a"+i+' href="'+e+'">'+b+"</a>",window.parent.Joomla.editors.instances[g].replaceSelection(h),window.parent.jModalClose()},document.addEventListener("DOMContentLoaded",function(){for(var a=document.querySelectorAll(".select-link"),b=0,c=a.length;c>b;b++)a[b].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-function");"jSelectArticle"===b?window[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),a.target.getAttribute("data-cat-id"),null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language")):window.parent[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),a.target.getAttribute("data-cat-id"),null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"))})})}();
\ No newline at end of file
+!function(){"use strict";window.jSelectArticle=function(a,b,c,d,e,f){var g,h,i="";return Joomla.getOptions("xtd-articles")?(g=Joomla.getOptions("xtd-articles").editor,""!==f&&(i=' hreflang="'+f+'"'),h="<a"+i+' href="'+e+'">'+b+"</a>",window.parent.Joomla.editors.instances[g].replaceSelection(h),void window.parent.Joomla.UI.Modal.close()):(window.parent.Joomla.UI.Modal.close(),!1)},document.addEventListener("DOMContentLoaded",function(){for(var a=document.querySelectorAll(".select-link"),b=0,c=a.length;c>b;b++)a[b].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-function");"jSelectArticle"===b?window[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),a.target.getAttribute("data-cat-id"),null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language")):window.parent[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),a.target.getAttribute("data-cat-id"),null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"))})})}();
\ No newline at end of file
diff --git a/media/com_fields/js/admin-fields-modal.js b/media/com_fields/js/admin-fields-modal.js
index f3fb9f1e088e0..59458b96adc29 100644
--- a/media/com_fields/js/admin-fields-modal.js
+++ b/media/com_fields/js/admin-fields-modal.js
@@ -14,7 +14,7 @@ Joomla = window.Joomla || {};
 			window.parent.jInsertEditorText("{field " + id + "}", editor);
 		}
 
-		window.parent.jModalClose();
+		window.parent.Joomla.UI.Modal.close();
 	};
 
 	Joomla.fieldgroupIns = function(id, editor) {
@@ -25,6 +25,6 @@ Joomla = window.Joomla || {};
 			window.parent.jInsertEditorText("{fieldgroup " + id + "}", editor);
 		}
 
-		window.parent.jModalClose();
+		window.parent.Joomla.UI.Modal.close();
 	};
 })(Joomla);
diff --git a/media/com_fields/js/admin-fields-modal.min.js b/media/com_fields/js/admin-fields-modal.min.js
index 55a2095195428..bcaab0ed73672 100644
--- a/media/com_fields/js/admin-fields-modal.min.js
+++ b/media/com_fields/js/admin-fields-modal.min.js
@@ -1 +1 @@
-Joomla=window.Joomla||{},function(a){a.fieldIns=function(a,b){window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(b)?window.parent.Joomla.editors.instances[b].replaceSelection("{field "+a+"}"):window.parent.jInsertEditorText("{field "+a+"}",b),window.parent.jModalClose()},a.fieldgroupIns=function(a,b){window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(b)?window.parent.Joomla.editors.instances[b].replaceSelection("{fieldgroup "+a+"}"):window.parent.jInsertEditorText("{fieldgroup "+a+"}",b),window.parent.jModalClose()}}(Joomla);
\ No newline at end of file
+Joomla=window.Joomla||{},function(a){a.fieldIns=function(a,b){window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(b)?window.parent.Joomla.editors.instances[b].replaceSelection("{field "+a+"}"):window.parent.jInsertEditorText("{field "+a+"}",b),window.parent.Joomla.UI.Modal.close()},a.fieldgroupIns=function(a,b){window.parent.Joomla&&window.parent.Joomla.editors&&window.parent.Joomla.editors.instances&&window.parent.Joomla.editors.instances.hasOwnProperty(b)?window.parent.Joomla.editors.instances[b].replaceSelection("{fieldgroup "+a+"}"):window.parent.jInsertEditorText("{fieldgroup "+a+"}",b),window.parent.Joomla.UI.Modal.close()}}(Joomla);
\ No newline at end of file
diff --git a/media/com_menus/js/admin-items-modal.js b/media/com_menus/js/admin-items-modal.js
index a934932a7f058..919124de0583b 100644
--- a/media/com_menus/js/admin-items-modal.js
+++ b/media/com_menus/js/admin-items-modal.js
@@ -17,7 +17,7 @@
 
 		if (!Joomla.getOptions('xtd-menus')) {
 			// Something went wrong!
-			window.parent.jModalClose();
+			window.parent.Joomla.UI.Modal.close();
 			return false;
 		}
 
@@ -31,7 +31,7 @@
 		tag = '<a href=\"' + uri + thislang + lang + '">' + title + '</a>';
 
 		window.parent.Joomla.editors.instances[editor].replaceSelection(tag);
-		window.parent.jModalClose();
+		window.parent.Joomla.UI.Modal.close();
 	};
 
 	document.addEventListener('DOMContentLoaded', function(){
diff --git a/media/com_menus/js/admin-items-modal.min.js b/media/com_menus/js/admin-items-modal.min.js
index 9911daadd2013..38824eed7a5fe 100644
--- a/media/com_menus/js/admin-items-modal.min.js
+++ b/media/com_menus/js/admin-items-modal.min.js
@@ -1 +1 @@
-!function(){"use strict";window.jSelectMenuItem=function(a,b,c,d,e,f){var g,h,i="";if(!Joomla.getOptions("xtd-menus"))return window.parent.jModalClose(),!1;h=Joomla.getOptions("xtd-menus").editor,""!==f&&(i="&lang="),g='<a href="'+c+i+f+'">'+b+"</a>",window.parent.Joomla.editors.instances[h].replaceSelection(g),window.parent.jModalClose()},document.addEventListener("DOMContentLoaded",function(){for(var a=document.querySelectorAll(".select-link"),b=0,c=a.length;c>b;b++)a[b].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-function");"jSelectMenuItem"===b?window[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),a.target.getAttribute("data-uri"),null,null,a.target.getAttribute("data-language")):window.parent[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),null,null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"),null)})})}();
\ No newline at end of file
+!function(){"use strict";window.jSelectMenuItem=function(a,b,c,d,e,f){var g,h,i="";return Joomla.getOptions("xtd-menus")?(h=Joomla.getOptions("xtd-menus").editor,""!==f&&(i="&lang="),g='<a href="'+c+i+f+'">'+b+"</a>",window.parent.Joomla.editors.instances[h].replaceSelection(g),void window.parent.Joomla.UI.Modal.close()):(window.parent.Joomla.UI.Modal.close(),!1)},document.addEventListener("DOMContentLoaded",function(){for(var a=document.querySelectorAll(".select-link"),b=0,c=a.length;c>b;b++)a[b].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-function");"jSelectMenuItem"===b?window[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),a.target.getAttribute("data-uri"),null,null,a.target.getAttribute("data-language")):window.parent[b](a.target.getAttribute("data-id"),a.target.getAttribute("data-title"),null,null,a.target.getAttribute("data-uri"),a.target.getAttribute("data-language"),null)})})}();
\ No newline at end of file
diff --git a/media/com_modules/js/admin-modules-modal.js b/media/com_modules/js/admin-modules-modal.js
index f836a9adcd236..7e6c6e9e033d7 100644
--- a/media/com_modules/js/admin-modules-modal.js
+++ b/media/com_modules/js/admin-modules-modal.js
@@ -19,7 +19,7 @@ document.addEventListener('DOMContentLoaded', function() {
 				editor = event.target.getAttribute('data-editor');
 
 			window.parent.Joomla.editors.instances[editor].replaceSelection("{loadmodule " + type + "," + name + "}");
-			window.parent.jModalClose();
+			window.parent.Joomla.UI.Modal.close();
 		});
 	}
 
@@ -31,7 +31,7 @@ document.addEventListener('DOMContentLoaded', function() {
 				editor = event.target.getAttribute('data-editor');
 
 			window.parent.Joomla.editors.instances[editor].replaceSelection("{loadposition " + position + "}");
-			window.parent.jModalClose();
+			window.parent.Joomla.UI.Modal.close();
 		});
 	}
 });
diff --git a/media/com_modules/js/admin-modules-modal.min.js b/media/com_modules/js/admin-modules-modal.min.js
index 54f1a7d85c145..943adbd031d7b 100644
--- a/media/com_modules/js/admin-modules-modal.min.js
+++ b/media/com_modules/js/admin-modules-modal.min.js
@@ -1 +1 @@
-document.addEventListener("DOMContentLoaded",function(){"use strict";var a,b=document.querySelectorAll(".js-module-insert"),c=document.querySelectorAll(".js-position-insert");for(a=0;b.length>a;a++)b[a].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-module"),c=a.target.getAttribute("data-title"),d=a.target.getAttribute("data-editor");window.parent.Joomla.editors.instances[d].replaceSelection("{loadmodule "+b+","+c+"}"),window.parent.jModalClose()});for(a=0;c.length>a;a++)c[a].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-position"),c=a.target.getAttribute("data-editor");window.parent.Joomla.editors.instances[c].replaceSelection("{loadposition "+b+"}"),window.parent.jModalClose()})});
\ No newline at end of file
+document.addEventListener("DOMContentLoaded",function(){"use strict";var a,b=document.querySelectorAll(".js-module-insert"),c=document.querySelectorAll(".js-position-insert");for(a=0;b.length>a;a++)b[a].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-module"),c=a.target.getAttribute("data-title"),d=a.target.getAttribute("data-editor");window.parent.Joomla.editors.instances[d].replaceSelection("{loadmodule "+b+","+c+"}"),window.parent.Joomla.UI.Modal.close()});for(a=0;c.length>a;a++)c[a].addEventListener("click",function(a){a.preventDefault();var b=a.target.getAttribute("data-position"),c=a.target.getAttribute("data-editor");window.parent.Joomla.editors.instances[c].replaceSelection("{loadposition "+b+"}"),window.parent.Joomla.UI.Modal.close()})});
\ No newline at end of file
diff --git a/media/editors/tinymce/js/plugins/dragdrop/plugin.js b/media/editors/tinymce/js/plugins/dragdrop/plugin.js
index b8b4d101ca192..0df78fac99920 100644
--- a/media/editors/tinymce/js/plugins/dragdrop/plugin.js
+++ b/media/editors/tinymce/js/plugins/dragdrop/plugin.js
@@ -63,69 +63,57 @@ tinymce.PluginManager.add('jdragdrop', function(editor) {
 
 	}
 
-	// Listers for drag and drop
-	if (typeof FormData != 'undefined'){
-
-		// Fix for Chrome
-		editor.on('dragenter', function(e) {
-			e.stopPropagation();
-
-			return false;
-		});
-
-
-		// Notify user when file is over the drop area
-		editor.on('dragover', function(e) {
-			e.preventDefault();
-			editor.contentAreaContainer.style.borderStyle = 'dashed';
-			editor.contentAreaContainer.style.borderWidth = '5px';
-
-			return false;
-		});
-
-		// Logic for the dropped file
-		editor.on('drop', function(e) {
-
-			// We override only for files
-			if (e.dataTransfer && e.dataTransfer.files && e.dataTransfer.files.length > 0) {
-				for (var i = 0, f; f = e.dataTransfer.files[i]; i++) {
-
-					// Only images allowed
-					if (f.name.toLowerCase().match(/\.(jpg|jpeg|png|gif)$/)) {
-
-						// Create and display the progress bar
-						var container, innerDiv, progressBar = '';
-						container = document.createElement('div');
-						container.id = 'jloader';
-						innerDiv = document.createElement('div');
-						innerDiv.classList.add('progress');
-						innerDiv.classList.add('progress-success');
-						innerDiv.classList.add('progress-striped');
-						innerDiv.classList.add('active');
-						innerDiv.style.width = '100%';
-						innerDiv.style.height = '30px';
-						progressBar = document.createElement('div');
-						progressBar.classList.add('bar');
-						progressBar.style.width = '0';
-						innerDiv.appendChild(progressBar);
-						container.appendChild(innerDiv);
-						document.querySelector('.mce-toolbar-grp').appendChild(container);
-
-						// Upload the file(s)
-						UploadFile(f);
-					}
-
-					e.preventDefault();
+	// Fix for Chrome
+	editor.on('dragenter', function(e) {
+		e.stopPropagation();
+
+		return false;
+	});
+
+	// Notify user when file is over the drop area
+	editor.on('dragover', function(e) {
+		e.preventDefault();
+		editor.contentAreaContainer.style.borderStyle = 'dashed';
+		editor.contentAreaContainer.style.borderWidth = '5px';
+
+		return false;
+	});
+
+	// Logic for the dropped file
+	editor.on('drop', function(e) {
+
+		// We override only for files
+		if (e.dataTransfer && e.dataTransfer.files && e.dataTransfer.files.length > 0) {
+			for (var i = 0, f; f = e.dataTransfer.files[i]; i++) {
+
+				// Only images allowed
+				if (f.name.toLowerCase().match(/\.(jpg|jpeg|png|gif)$/)) {
+
+					// Create and display the progress bar
+					var container, innerDiv, progressBar = '';
+					container = document.createElement('div');
+					container.id = 'jloader';
+					innerDiv = document.createElement('div');
+					innerDiv.classList.add('progress');
+					innerDiv.classList.add('progress-success');
+					innerDiv.classList.add('progress-striped');
+					innerDiv.classList.add('active');
+					innerDiv.style.width = '100%';
+					innerDiv.style.height = '30px';
+					progressBar = document.createElement('div');
+					progressBar.classList.add('bar');
+					progressBar.style.width = '0';
+					innerDiv.appendChild(progressBar);
+					container.appendChild(innerDiv);
+					document.querySelector('.mce-toolbar-grp').appendChild(container);
+
+					// Upload the file(s)
+					UploadFile(f);
 				}
+
+				e.preventDefault();
 			}
-			editor.contentAreaContainer.style.borderWidth = '1px 0 0';
-		});
-	} else {
-		Joomla.renderMessages({'error': [Joomla.JText._("PLG_TINY_ERR_UNSUPPORTEDBROWSER")]});
-		editor.on('drop', function(e) {
-			e.preventDefault();
-
-			return false;
-		});
-	}
+		}
+		editor.contentAreaContainer.style.borderWidth = '1px 0 0';
+	});
 });
diff --git a/media/editors/tinymce/js/plugins/dragdrop/plugin.min.js b/media/editors/tinymce/js/plugins/dragdrop/plugin.min.js
index 7bbd46226f1af..4a8b38f94c19a 100644
--- a/media/editors/tinymce/js/plugins/dragdrop/plugin.min.js
+++ b/media/editors/tinymce/js/plugins/dragdrop/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("jdragdrop",function(a){function b(b){var c=new FormData;c.append("Filedata",b),c.append("folder",tinyMCE.activeEditor.settings.mediaUploadPath);var d=new XMLHttpRequest;d.upload.onprogress=function(a){var b=a.loaded/a.total*100;document.querySelector(".bar").style.width=b+"%"},removeProgessBar=function(){setTimeout(function(){var b=document.querySelector("#jloader");b.parentNode.removeChild(b),a.contentAreaContainer.style.borderWidth="1px 0 0 0"},200)},d.onload=function(){var b=JSON.parse(d.responseText);if(200==d.status){if("0"==b.status&&(removeProgessBar(),a.windowManager.alert(b.message+": "+setCustomDir+b.location)),"1"==b.status){removeProgessBar();var c=tinyMCE.activeEditor.getDoc().createElement("img");c.src=tinyMCE.activeEditor.settings.setCustomDir+b.location,tinyMCE.activeEditor.execCommand("mceInsertContent",!1,c.outerHTML)}}else removeProgessBar()},d.onerror=function(){removeProgessBar()},d.open("POST",tinyMCE.activeEditor.settings.uploadUri,!0),d.send(c)}tinyMCE.DOM.bind(document,"dragleave",function(a){return a.stopPropagation(),a.preventDefault(),tinyMCE.activeEditor.contentAreaContainer.style.borderWidth="1px 0 0",!1}),"undefined"!=typeof FormData?(a.on("dragenter",function(a){return a.stopPropagation(),!1}),a.on("dragover",function(b){return b.preventDefault(),a.contentAreaContainer.style.borderStyle="dashed",a.contentAreaContainer.style.borderWidth="5px",!1}),a.on("drop",function(c){if(c.dataTransfer&&c.dataTransfer.files&&c.dataTransfer.files.length>0)for(var d,e=0;d=c.dataTransfer.files[e];e++){if(d.name.toLowerCase().match(/\.(jpg|jpeg|png|gif)$/)){var f,g,h="";f=document.createElement("div"),f.id="jloader",g=document.createElement("div"),g.classList.add("progress"),g.classList.add("progress-success"),g.classList.add("progress-striped"),g.classList.add("active"),g.style.width="100%",g.style.height="30px",h=document.createElement("div"),h.classList.add("bar"),h.style.width="0",g.appendChild(h),f.appendChild(g),document.querySelector(".mce-toolbar-grp").appendChild(f),b(d)}c.preventDefault()}a.contentAreaContainer.style.borderWidth="1px 0 0"})):(Joomla.renderMessages({error:[Joomla.JText._("PLG_TINY_ERR_UNSUPPORTEDBROWSER")]}),a.on("drop",function(a){return a.preventDefault(),!1}))});
\ No newline at end of file
+tinymce.PluginManager.add("jdragdrop",function(a){function b(b){var c=new FormData;c.append("Filedata",b),c.append("folder",tinyMCE.activeEditor.settings.mediaUploadPath);var d=new XMLHttpRequest;d.upload.onprogress=function(a){var b=a.loaded/a.total*100;document.querySelector(".bar").style.width=b+"%"},removeProgessBar=function(){setTimeout(function(){var b=document.querySelector("#jloader");b.parentNode.removeChild(b),a.contentAreaContainer.style.borderWidth="1px 0 0 0"},200)},d.onload=function(){var b=JSON.parse(d.responseText);if(200==d.status){if("0"==b.status&&(removeProgessBar(),a.windowManager.alert(b.message+": "+setCustomDir+b.location)),"1"==b.status){removeProgessBar();var c=tinyMCE.activeEditor.getDoc().createElement("img");c.src=tinyMCE.activeEditor.settings.setCustomDir+b.location,tinyMCE.activeEditor.execCommand("mceInsertContent",!1,c.outerHTML)}}else removeProgessBar()},d.onerror=function(){removeProgessBar()},d.open("POST",tinyMCE.activeEditor.settings.uploadUri,!0),d.send(c)}tinyMCE.DOM.bind(document,"dragleave",function(a){return a.stopPropagation(),a.preventDefault(),tinyMCE.activeEditor.contentAreaContainer.style.borderWidth="1px 0 0",!1}),a.on("dragenter",function(a){return a.stopPropagation(),!1}),a.on("dragover",function(b){return b.preventDefault(),a.contentAreaContainer.style.borderStyle="dashed",a.contentAreaContainer.style.borderWidth="5px",!1}),a.on("drop",function(c){if(c.dataTransfer&&c.dataTransfer.files&&c.dataTransfer.files.length>0)for(var d,e=0;d=c.dataTransfer.files[e];e++){if(d.name.toLowerCase().match(/\.(jpg|jpeg|png|gif)$/)){var f,g,h="";f=document.createElement("div"),f.id="jloader",g=document.createElement("div"),g.classList.add("progress"),g.classList.add("progress-success"),g.classList.add("progress-striped"),g.classList.add("active"),g.style.width="100%",g.style.height="30px",h=document.createElement("div"),h.classList.add("bar"),h.style.width="0",g.appendChild(h),f.appendChild(g),document.querySelector(".mce-toolbar-grp").appendChild(f),b(d)}c.preventDefault()}a.contentAreaContainer.style.borderWidth="1px 0 0"})});
\ No newline at end of file
diff --git a/media/editors/tinymce/js/tiny-close.js b/media/editors/tinymce/js/tiny-close.js
index 184856aec9e54..0c403048f8bca 100644
--- a/media/editors/tinymce/js/tiny-close.js
+++ b/media/editors/tinymce/js/tiny-close.js
@@ -11,12 +11,16 @@
  * @since       3.5.1
  * @version     1.0
  */
+Joomla = window.Joomla || {};
+Joomla.UI = Joomla.UI || {};
+Joomla.UI.Modal = Joomla.UI.Modal || {};
+
 document.addEventListener('DOMContentLoaded', function () {
 	if (typeof window.jModalClose_no_tinyMCE === 'undefined')
 	{
-		window.jModalClose_no_tinyMCE = typeof(jModalClose) == 'function'  ?  jModalClose  :  false;
+		window.jModalClose_no_tinyMCE = typeof(Joomla.UI.Modal.close) == 'function'  ?  Joomla.UI.Modal.close  :  false;
 
-		jModalClose = function () {
+		Joomla.UI.Modal.close = function () {
 			if (window.jModalClose_no_tinyMCE) window.jModalClose_no_tinyMCE.apply(this, arguments);
 			tinyMCE.activeEditor.windowManager.close();
 		};
diff --git a/media/editors/tinymce/js/tiny-close.min.js b/media/editors/tinymce/js/tiny-close.min.js
index 8a1faa59246f7..e611a183948cd 100644
--- a/media/editors/tinymce/js/tiny-close.min.js
+++ b/media/editors/tinymce/js/tiny-close.min.js
@@ -1 +1 @@
-document.addEventListener("DOMContentLoaded",function(){void 0===window.jModalClose_no_tinyMCE&&(window.jModalClose_no_tinyMCE="function"==typeof jModalClose&&jModalClose,jModalClose=function(){window.jModalClose_no_tinyMCE&&window.jModalClose_no_tinyMCE.apply(this,arguments),tinyMCE.activeEditor.windowManager.close()})});
\ No newline at end of file
+Joomla=window.Joomla||{},Joomla.UI=Joomla.UI||{},Joomla.UI.Modal=Joomla.UI.Modal||{},document.addEventListener("DOMContentLoaded",function(){"undefined"==typeof window.jModalClose_no_tinyMCE&&(window.jModalClose_no_tinyMCE="function"==typeof Joomla.UI.Modal.close&&Joomla.UI.Modal.close,Joomla.UI.Modal.close=function(){window.jModalClose_no_tinyMCE&&window.jModalClose_no_tinyMCE.apply(this,arguments),tinyMCE.activeEditor.windowManager.close()})});
\ No newline at end of file
diff --git a/media/editors/tinymce/js/tinymce-builder.min.js b/media/editors/tinymce/js/tinymce-builder.min.js
new file mode 100644
index 0000000000000..8dd4b84b127d8
--- /dev/null
+++ b/media/editors/tinymce/js/tinymce-builder.min.js
@@ -0,0 +1 @@
+!function(a){"use strict";window.tinymce={langCode:"en",langStrings:{},addI18n:function(a,b){this.langCode=a,this.langStrings=b||{}},translate:function(a){return this.langStrings[a]?this.langStrings[a]:a}};var b=function(b,c){this.$container=a(b),this.options=c,this.$sourceMenu=this.$container.find(".timymce-builder-menu.source"),this.$sourceToolbar=this.$container.find(".timymce-builder-toolbar.source"),this.$targetMenu=this.$container.find(".timymce-builder-menu.target"),this.$targetToolbar=this.$container.find(".timymce-builder-toolbar.target"),this.$sourceMenu.each(function(a,b){this.renderBar(b,"menu")}.bind(this)),this.$sourceToolbar.each(function(a,b){this.renderBar(b,"toolbar")}.bind(this)),this.$targetMenu.each(function(a,b){this.renderBar(b,"menu",null,!0)}.bind(this)),this.$targetToolbar.each(function(a,b){this.renderBar(b,"toolbar",null,!0)}.bind(this));var d=null,e=!1,f=this;this.$sourceMenu.sortable({connectWith:this.$targetMenu,items:".mce-btn",cancel:"",placeholder:"mce-btn ui-state-highlight",start:function(a,b){f.$targetMenu.addClass("drop-area-highlight")},helper:function(a,b){return d=b.clone().insertAfter(b),b},stop:function(){d&&d.remove(),f.$targetMenu.removeClass("drop-area-highlight")}}),this.$sourceToolbar.sortable({connectWith:this.$targetToolbar,items:".mce-btn",cancel:"",placeholder:"mce-btn ui-state-highlight",start:function(a,b){f.$targetToolbar.addClass("drop-area-highlight")},helper:function(a,b){return d=b.clone().insertAfter(b),b},stop:function(){d&&d.remove(),f.$targetToolbar.removeClass("drop-area-highlight")}}),a().add(this.$targetMenu).add(this.$targetToolbar).sortable({items:".mce-btn",cancel:"",placeholder:"mce-btn ui-state-highlight",receive:function(b,c){d=null;var e=c.item,g=a(this);f.appendInput(e,g.data("group"),g.data("set"))},over:function(a,b){e=!1},out:function(a,b){e=!0},beforeStop:function(a,b){e&&b.item.remove()}}),this.$container.on("click",".button-action",function(b){var c=a(b.target),d=c.data("action"),e=c.data();if(!this[d])throw new Error("Unsupported action "+d);this[d].call(this,e)}.bind(this))};b.prototype.renderBar=function(b,c,d,e){for(var f,g,h,i=a(b),j=i.data("group"),k=i.data("set"),l="menu"===c?this.options.menus:this.options.buttons,d=d?d:i.data("value")||[],m=0,n=d.length;m<n;m++)g=d[m],f=l[g],f&&(h=this.createButton(g,f,c),i.append(h),h.tooltip&&h.tooltip({trigger:"hover"}),e&&this.appendInput(h,j,k))},b.prototype.createButton=function(b,c,d){var e=a("<div />",{class:"mce-btn","data-name":b,"data-toggle":"tooltip",title:tinymce.translate(c.label)}),f=a("<button/>",{type:"button"});return e.append(f),"menu"===d?f.html('<span class="mce-txt">'+tinymce.translate(c.label)+'</span> <i class="mce-caret"></i>'):(e.addClass("mce-btn-small"),f.html(c.text?tinymce.translate(c.text):'<span class="mce-ico mce-i-'+b+'"></span>')),e},b.prototype.appendInput=function(b,c,d){var e=a(b),f=this.options.formControl+"["+d+"]["+c+"][]",g=a("<input/>",{type:"hidden",name:f,value:e.data("name")});e.append(g)},b.prototype.setPreset=function(a){var b=a.set,c=this.options.toolbarPreset[a.preset]||null;if(!c)throw new Error('Unknown Preset "'+a.preset+'"');var d,e;for(var f in c)c.hasOwnProperty(f)&&("menu"===f?(e="menu",d=this.$targetMenu.filter('[data-group="'+f+'"][data-set="'+b+'"]')):(e="toolbar",d=this.$targetToolbar.filter('[data-group="'+f+'"][data-set="'+b+'"]')),d.empty(),this.renderBar(d,e,c[f],!0))},b.prototype.clearPane=function(a){var b=a.set;this.$targetMenu.filter('[data-set="'+b+'"]').empty(),this.$targetToolbar.filter('[data-set="'+b+'"]').empty()},a(document).ready(function(){function c(){e.find("option[disabled]").removeAttr("disabled"),e.each(function(){for(var b=a(this),c=b.val()||[],d=[],f=e.not(this).find("option"),g=0,h=c.length;g<h;g++)c[g]&&d.push('[value="'+c[g]+'"]');d.length&&f.filter(d.join(",")).attr("disabled","disabled")}),e.trigger("liszt:updated")}var d=Joomla.getOptions?Joomla.getOptions("plg_editors_tinymce_builder",{}):Joomla.optionsStorage.plg_editors_tinymce_builder||{};new b(a("#joomla-tinymce-builder"),d),a("#set-tabs a").on("click",function(b){b.preventDefault(),a(this).tab("show")});var e=a("#joomla-tinymce-builder").find(".access-select");c(),e.on("change",function(){c()})})}(jQuery);
\ No newline at end of file
diff --git a/media/editors/tinymce/js/tinymce.js b/media/editors/tinymce/js/tinymce.js
index 73b6693fff6ff..18dea33b81517 100644
--- a/media/editors/tinymce/js/tinymce.js
+++ b/media/editors/tinymce/js/tinymce.js
@@ -6,9 +6,6 @@
 ;(function(tinyMCE, Joomla, window, document){
 	"use strict";
 
-	// This line is for Mootools b/c
-	window.getSize = window.getSize || function(){return {x: window.innerWidth, y: window.innerHeight};};
-
 	var JoomlaTinyMCE = {
 
 		/**
@@ -91,7 +88,6 @@
         return Joomla.editors.instances[ed.targetElm.id].onSave();
 			})
 		}
-
 	};
 
 	Joomla.JoomlaTinyMCE = JoomlaTinyMCE;
diff --git a/media/editors/tinymce/js/tinymce.min.js b/media/editors/tinymce/js/tinymce.min.js
index 614920a8827d6..62e7bf4007d37 100644
--- a/media/editors/tinymce/js/tinymce.min.js
+++ b/media/editors/tinymce/js/tinymce.min.js
@@ -1 +1 @@
-!function(a,b,c,d){"use strict";c.getSize=c.getSize||function(){return{x:c.innerWidth,y:c.innerHeight}};var e={setupEditors:function(a){a=a||d;for(var c=b.getOptions?b.getOptions("plg_editor_tinymce",{}):b.optionsStorage.plg_editor_tinymce||{},e=a.querySelectorAll(".js-editor-tinymce"),f=0,g=e.length;f<g;f++){var h=e[f].querySelector("textarea");this.setupEditor(h,c)}},setupEditor:function(c,e){var f=c?c.getAttribute("name").replace(/\[\]|\]/g,"").split("[").pop():"default",g=e?e.tinyMCE||{}:{},h=g.default||{},i=g[f]?g[f]:h;if(i=i.joomlaMergeDefaults?b.extend(b.extend({},h),i):b.extend({},i),c&&(i.selector=null,i.target=c),i.joomlaExtButtons&&i.joomlaExtButtons.names&&i.joomlaExtButtons.names.length){i.toolbar1+=" | "+i.joomlaExtButtons.names.join(" ");var j=i.joomlaExtButtons.script.join(";");i.setupCallbackString=i.setupCallbackString||"",i.setupCallbackString=i.setupCallbackString+";"+j,i.joomlaExtButtons=null}i.setupCallbackString&&!i.setup&&(i.setup=new Function("editor",i.setupCallbackString));var k=new a.Editor(c.id,i,tinymce.EditorManager);k.render(),b.editors.instances[c.id]={getValue:function(){return this.instance.getContent()},setValue:function(a){return this.instance.setContent(a)},replaceSelection:function(a){return this.instance.execCommand("mceInsertContent",!1,a)},id:c.id,instance:k,onSave:function(){return this.instance.isHidden()&&this.instance.show(),""}},d.getElementById(k.id).form.addEventListener("submit",function(){return b.editors.instances[k.targetElm.id].onSave()})}};b.JoomlaTinyMCE=e,d.addEventListener("DOMContentLoaded",function(){b.JoomlaTinyMCE.setupEditors(),c.jQuery&&jQuery(d).on("subform-row-add",function(a,c){b.JoomlaTinyMCE.setupEditors(c)})})}(tinyMCE,Joomla,window,document);
\ No newline at end of file
+!function(a,b,c,d){"use strict";var e={setupEditors:function(a){a=a||d;for(var c=b.getOptions?b.getOptions("plg_editor_tinymce",{}):b.optionsStorage.plg_editor_tinymce||{},e=a.querySelectorAll(".js-editor-tinymce"),f=0,g=e.length;f<g;f++){var h=e[f].querySelector("textarea");this.setupEditor(h,c)}},setupEditor:function(c,e){var f=c?c.getAttribute("name").replace(/\[\]|\]/g,"").split("[").pop():"default",g=e?e.tinyMCE||{}:{},h=g.default||{},i=g[f]?g[f]:h;if(i=i.joomlaMergeDefaults?b.extend(b.extend({},h),i):b.extend({},i),c&&(i.selector=null,i.target=c),i.joomlaExtButtons&&i.joomlaExtButtons.names&&i.joomlaExtButtons.names.length){i.toolbar1+=" | "+i.joomlaExtButtons.names.join(" ");var j=i.joomlaExtButtons.script.join(";");i.setupCallbackString=i.setupCallbackString||"",i.setupCallbackString=i.setupCallbackString+";"+j,i.joomlaExtButtons=null}i.setupCallbackString&&!i.setup&&(i.setup=new Function("editor",i.setupCallbackString));var k=new a.Editor(c.id,i,tinymce.EditorManager);k.render(),b.editors.instances[c.id]={getValue:function(){return this.instance.getContent()},setValue:function(a){return this.instance.setContent(a)},replaceSelection:function(a){return this.instance.execCommand("mceInsertContent",!1,a)},id:c.id,instance:k,onSave:function(){return this.instance.isHidden()&&this.instance.show(),""}},d.getElementById(k.id).form.addEventListener("submit",function(){return b.editors.instances[k.targetElm.id].onSave()})}};b.JoomlaTinyMCE=e,d.addEventListener("DOMContentLoaded",function(){b.JoomlaTinyMCE.setupEditors(),c.jQuery&&jQuery(d).on("subform-row-add",function(a,c){b.JoomlaTinyMCE.setupEditors(c)})})}(tinyMCE,Joomla,window,document);
\ No newline at end of file
diff --git a/media/media/js/mediafield.js b/media/media/js/mediafield.js
deleted file mode 100644
index ba7f792ea9cc3..0000000000000
--- a/media/media/js/mediafield.js
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license	    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-/**
- * Field media
- */
-;(function($){
-	'use strict';
-
-	if (!Function.prototype.bind) {
-		Function.prototype.bind = function(oThis) {
-			if (typeof this !== 'function') {
-				// closest thing possible to the ECMAScript 5
-				// internal IsCallable function
-				throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
-			}
-
-			var aArgs   = Array.prototype.slice.call(arguments, 1),
-			    fToBind = this,
-			    fNOP    = function() {},
-			    fBound  = function() {
-				    return fToBind.apply(this instanceof fNOP && oThis
-						    ? this
-						    : oThis,
-					    aArgs.concat(Array.prototype.slice.call(arguments)));
-			    };
-
-			fNOP.prototype = this.prototype;
-			fBound.prototype = new fNOP();
-
-			return fBound;
-		};
-	}
-
-	$.fieldMedia = function(container, options){
-		// Merge options with defaults
-		this.options = $.extend({}, $.fieldMedia.defaults, options);
-
-		// Set up elements
-		this.$container = $(container);
-		this.$modal = this.$container.find(this.options.modal);
-		this.$modalBody = this.$modal.children('.modal-body');
-		this.$input = this.$container.find(this.options.input);
-		this.$containerPreview = this.$container.find(this.options.previewContainer);
-		this.$buttonSelect = this.$container.find(this.options.buttonSelect);
-		this.$buttonClear  = this.$container.find(this.options.buttonClear);
-
-		// Bind events
-		this.$buttonSelect.on('click', this.modalOpen.bind(this));
-		this.$buttonClear.on('click', this.clearValue.bind(this));
-		this.$modal.on('hide', this.removeIframe.bind(this));
-
-		// Update preview for existing value
-		this.updatePreview();
-	};
-
-	// display modal for select the file
-	$.fieldMedia.prototype.modalOpen = function() {
-		var $iframe = $('<iframe>', {
-			name: 'field-media-modal',
-			src: this.options.url.replace('{field-media-id}', this.$input.attr('id')),
-			width: this.options.modalWidth,
-			height: this.options.modalHeight
-		});
-		this.$modalBody.append($iframe);
-		this.$modal.modal('show');
-		$('body').addClass('modal-open');
-
-		var self = this; // save context
-		$iframe.on('load', function(){
-			var content = $(this).contents();
-
-			// bind insert
-			content.on('click', self.options.buttonSaveSelected, function(){
-				var value = content.find('#f_url').val();
-				if (value) {
-					self.setValue(value);
-				}
-				self.modalClose.call(self);
-			});
-
-			// bind cancel
-			content.on('click', '.button-cancel', function(){
-				$('body').removeClass('modal-open');
-				self.modalClose.bind(self);
-			});
-		});
-	};
-
-	// close modal
-	$.fieldMedia.prototype.modalClose = function() {
-		this.$modal.modal('hide');
-		$('body').removeClass('modal-open');
-		this.$modalBody.empty();
-	};
-
-	// Clear the iframe
-	$.fieldMedia.prototype.removeIframe = function() {
-		this.$modalBody.empty();
-		$('body').removeClass('modal-open');
-	};
-
-	// set the value
-	$.fieldMedia.prototype.setValue = function(value) {
-		this.$input.val(value).trigger('change');
-		this.updatePreview();
-	};
-
-	// clear the value
-	$.fieldMedia.prototype.clearValue = function() {
-		this.setValue('');
-	};
-
-	// update preview
-	$.fieldMedia.prototype.updatePreview = function() {
-		if (!this.options.preview) {
-			return;
-		}
-
-		if (this.options.preview && !this.options.previewAsTooltip) {
-			var value = this.$input.val();
-
-			if (!value) {
-				this.$containerPreview.append('');
-			} else {
-				var imgPreview = new Image();
-				imgPreview.src = this.options.basepath + value;
-				if (imgPreview.width > imgPreview.height) {
-					this.$containerPreview.html($('<img>',{src: imgPreview.src, style: 'width: ' + this.options.previewWidth + 'px'}));
-				} else {
-					this.$containerPreview.html($('<img>',{src: imgPreview.src, style: 'height: ' + this.options.previewHeight + 'px'}));
-				}
-			}
-		} else {
-			// Reset tooltip and preview
-			this.$containerPreview.popover('destroy');
-			this.$input.tooltip('destroy');
-
-			var value = this.$input.val();
-
-			if (!value) {
-				this.$containerPreview.popover();
-			} else {
-				var imgPreview = new Image(this.options.previewWidth, this.options.previewHeight);
-				imgPreview.src = this.options.basepath + value;
-
-				this.$containerPreview.popover({content: imgPreview});
-				this.$input.tooltip({placement: 'top', title: value});
-			}
-		}
-	};
-
-	// default options
-	$.fieldMedia.defaults = {
-		basepath: '', // base path to file
-		buttonClear: '.button-clear', // selector for button to clear the value
-		buttonSelect: '.button-select', // selector for button to change the value
-		buttonSaveSelected: '.button-save-selected', // selector for button to save the selected value
-		input: '.field-media-input', // selector for the input
-		preview: true, // whether use the preview
-		previewAsTooltip: true, // whether use the preview
-		previewContainer: '.field-media-preview', // selector for the preview container
-		previewWidth: 200, // preview width
-		previewHeight: 200, // preview height
-		url: 'index.php?option=com_media&tmpl=component', // url for load the iframe
-		modal: '.modal', // modal selector
-		modalWidth: '100%', // modal width
-		modalHeight: '300px', // modal height
-	};
-
-	$.fn.fieldMedia = function(options){
-		return this.each(function(){
-			var $el = $(this), instance = $el.data('fieldMedia');
-			if(!instance){
-				var options = options || {},
-					data = $el.data();
-
-				// Check options in the element
-				for (var p in data) {
-					if (data.hasOwnProperty(p)) {
-						options[p] = data[p];
-					}
-				}
-
-				instance = new $.fieldMedia(this, options);
-				$el.data('fieldMedia', instance);
-			}
-		});
-	};
-
-	// Initialise all defaults
-	$(document).ready(function(){
-		$('.field-media-wrapper').fieldMedia();
-	});
-
-})(jQuery);
-
-// Compatibility with mootools modal layout
-function jInsertFieldValue(value, id) {
-	var $ = jQuery.noConflict();
-	var old_value = $("#" + id).val();
-	if (old_value != value) {
-		var $elem = $("#" + id);
-		$elem.val(value);
-		$elem.trigger("change");
-		if (typeof($elem.get(0).onchange) === "function") {
-			$elem.get(0).onchange();
-		}
-		jMediaRefreshPreview(id);
-	}
-}
-
-function jMediaRefreshPreview(id) {
-	var $ = jQuery.noConflict();
-	var value = $("#" + id).val();
-	var $img = $("#" + id + "_preview");
-	var basepath = $("#" + id).data("basepath");
-
-	if ($img.length) {
-		if (value) {
-			$img.attr("src", basepath + value);
-			$("#" + id + "_preview_empty").hide();
-			$("#" + id + "_preview_img").show()
-		} else {
-			$img.attr("src", "");
-			$("#" + id + "_preview_empty").show();
-			$("#" + id + "_preview_img").hide();
-		}
-	}
-}
-
-function jMediaRefreshPreviewTip(tip)
-{
-	var $ = jQuery.noConflict();
-	var $tip = $(tip);
-	var $img = $tip.find("img.media-preview");
-
-	$img.each(function(index, value) {
-		$tip.find("div.tip").css("max-width", "none");
-		var id = $(this).attr("id");
-		id = id.substring(0, id.length - "_preview".length);
-		jMediaRefreshPreview(id);
-		$tip.show(this);
-	});
-}
-
-// JQuery for tooltip for INPUT showing whole image path
-function jMediaRefreshImgpathTip(tip, els)
-{
-	var $ = jQuery.noConflict();
-	var $tip = $(tip);
-	$tip.css("max-width", "none");
-	var $imgpath = $(els).val();
-	$("#TipImgpath").html($imgpath);
-
-	if ($imgpath.length) {
-		$tip.show();
-	} else {
-		$tip.hide();
-	}
-}
diff --git a/media/media/js/mediafield.min.js b/media/media/js/mediafield.min.js
deleted file mode 100644
index 9f6d2a545505b..0000000000000
--- a/media/media/js/mediafield.min.js
+++ /dev/null
@@ -1 +0,0 @@
-function jInsertFieldValue(a,b){var c=jQuery.noConflict();if(c("#"+b).val()!=a){var d=c("#"+b);d.val(a),d.trigger("change"),"function"==typeof d.get(0).onchange&&d.get(0).onchange(),jMediaRefreshPreview(b)}}function jMediaRefreshPreview(a){var b=jQuery.noConflict(),c=b("#"+a).val(),d=b("#"+a+"_preview"),e=b("#"+a).data("basepath");d.length&&(c?(d.attr("src",e+c),b("#"+a+"_preview_empty").hide(),b("#"+a+"_preview_img").show()):(d.attr("src",""),b("#"+a+"_preview_empty").show(),b("#"+a+"_preview_img").hide()))}function jMediaRefreshPreviewTip(a){var b=jQuery.noConflict(),c=b(a);c.find("img.media-preview").each(function(a,d){c.find("div.tip").css("max-width","none");var e=b(this).attr("id");e=e.substring(0,e.length-"_preview".length),jMediaRefreshPreview(e),c.show(this)})}function jMediaRefreshImgpathTip(a,b){var c=jQuery.noConflict(),d=c(a);d.css("max-width","none");var e=c(b).val();c("#TipImgpath").html(e),e.length?d.show():d.hide()}!function(a){"use strict";Function.prototype.bind||(Function.prototype.bind=function(a){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var b=Array.prototype.slice.call(arguments,1),c=this,d=function(){},e=function(){return c.apply(this instanceof d&&a?this:a,b.concat(Array.prototype.slice.call(arguments)))};return d.prototype=this.prototype,e.prototype=new d,e}),a.fieldMedia=function(b,c){this.options=a.extend({},a.fieldMedia.defaults,c),this.$container=a(b),this.$modal=this.$container.find(this.options.modal),this.$modalBody=this.$modal.children(".modal-body"),this.$input=this.$container.find(this.options.input),this.$containerPreview=this.$container.find(this.options.previewContainer),this.$buttonSelect=this.$container.find(this.options.buttonSelect),this.$buttonClear=this.$container.find(this.options.buttonClear),this.$buttonSelect.on("click",this.modalOpen.bind(this)),this.$buttonClear.on("click",this.clearValue.bind(this)),this.$modal.on("hide",this.removeIframe.bind(this)),this.updatePreview()},a.fieldMedia.prototype.modalOpen=function(){var b=a("<iframe>",{name:"field-media-modal",src:this.options.url.replace("{field-media-id}",this.$input.attr("id")),width:this.options.modalWidth,height:this.options.modalHeight});this.$modalBody.append(b),this.$modal.modal("show"),a("body").addClass("modal-open");var c=this;b.on("load",function(){var b=a(this).contents();b.on("click",c.options.buttonSaveSelected,function(){var a=b.find("#f_url").val();a&&c.setValue(a),c.modalClose.call(c)}),b.on("click",".button-cancel",function(){a("body").removeClass("modal-open"),c.modalClose.bind(c)})})},a.fieldMedia.prototype.modalClose=function(){this.$modal.modal("hide"),a("body").removeClass("modal-open"),this.$modalBody.empty()},a.fieldMedia.prototype.removeIframe=function(){this.$modalBody.empty(),a("body").removeClass("modal-open")},a.fieldMedia.prototype.setValue=function(a){this.$input.val(a).trigger("change"),this.updatePreview()},a.fieldMedia.prototype.clearValue=function(){this.setValue("")},a.fieldMedia.prototype.updatePreview=function(){if(this.options.preview)if(this.options.preview&&!this.options.previewAsTooltip){var b=this.$input.val();if(b){var c=new Image;c.src=this.options.basepath+b,c.width>c.height?this.$containerPreview.html(a("<img>",{src:c.src,style:"width: "+this.options.previewWidth+"px"})):this.$containerPreview.html(a("<img>",{src:c.src,style:"height: "+this.options.previewHeight+"px"}))}else this.$containerPreview.append("")}else{this.$containerPreview.popover("destroy"),this.$input.tooltip("destroy");var b=this.$input.val();if(b){var c=new Image(this.options.previewWidth,this.options.previewHeight);c.src=this.options.basepath+b,this.$containerPreview.popover({content:c}),this.$input.tooltip({placement:"top",title:b})}else this.$containerPreview.popover()}},a.fieldMedia.defaults={basepath:"",buttonClear:".button-clear",buttonSelect:".button-select",buttonSaveSelected:".button-save-selected",input:".field-media-input",preview:!0,previewAsTooltip:!0,previewContainer:".field-media-preview",previewWidth:200,previewHeight:200,url:"index.php?option=com_media&tmpl=component",modal:".modal",modalWidth:"100%",modalHeight:"300px"},a.fn.fieldMedia=function(b){return this.each(function(){var b=a(this),c=b.data("fieldMedia");if(!c){var d=d||{},e=b.data();for(var f in e)e.hasOwnProperty(f)&&(d[f]=e[f]);c=new a.fieldMedia(this,d),b.data("fieldMedia",c)}})},a(document).ready(function(){a(".field-media-wrapper").fieldMedia()})}(jQuery);
\ No newline at end of file
diff --git a/media/media/js/popup-imagemanager.js b/media/media/js/popup-imagemanager.js
index 1aaf45185644d..9d4e4c9521e19 100644
--- a/media/media/js/popup-imagemanager.js
+++ b/media/media/js/popup-imagemanager.js
@@ -153,7 +153,7 @@
 			}
 
 			window.parent.Joomla.editors.instances[this.editor].replaceSelection(tag);
-
+			window.parent.Joomla.UI.Modal.close();
 			return true;
 		},
 
diff --git a/media/media/js/popup-imagemanager.min.js b/media/media/js/popup-imagemanager.min.js
index c801f4a3d9e35..e1996a119a020 100644
--- a/media/media/js/popup-imagemanager.min.js
+++ b/media/media/js/popup-imagemanager.min.js
@@ -1 +1 @@
-!function(a,b){"use strict";window.ImageManager={initialize:function(){var c=this.getUriObject(window.self.location.href),d=this.getQueryObject(c.query);this.editor=decodeURIComponent(d.e_name),this.fields={url:b.getElementById("f_url"),alt:b.getElementById("f_alt"),align:b.getElementById("f_align"),title:b.getElementById("f_title"),caption:b.getElementById("f_caption"),c_class:b.getElementById("f_caption_class")},this.folderlist=b.getElementById("folderlist"),this.frame=window.frames.imageframe,this.frameurl=this.frame.location.href,a("#imageframe").on("load",function(){ImageManager.onloadimageview()}),a("#upbutton").off("click").on("click",function(){ImageManager.upFolder()})},onloadimageview:function(){var b,c,d=this.getImageFolder(),e=a("#uploadForm"),f="";this.frameurl=this.frame.location.href,this.setFolder(d),b=this.getUriObject(e.attr("action")),c=this.getQueryObject(b.query),c.folder=d,b.query=a.param(c),void 0!==b.port&&80!=b.port&&(f=":"+b.port),e.attr("action",b.scheme+"://"+b.domain+f+b.path+"?"+b.query)},getImageFolder:function(){return this.getQueryObject(this.frame.location.search.substring(1)).folder},onok:function(){var a="",b=[],c="",d="",e=this.fields.url.value,f=this.fields.alt.value,g=this.fields.align.value,h=this.fields.title.value,i=this.fields.caption.value,j=this.fields.c_class.value;return e&&(b.push('alt="'+f+'"'),g&&!i&&b.push('class="float-xs-'+g+'"'),h&&b.push('title="'+h+'"'),a='<img src="'+e+'" '+b.join(" ")+"/>",i&&(g&&(c=' class="float-xs-'+g+'"'),j&&(d=' class="'+j+'"'),a="<figure"+c+">"+a+"<figcaption"+d+">"+i+"</figcaption></figure>")),window.parent.Joomla.editors.instances[this.editor].replaceSelection(a),!0},setFolder:function(b,c,d){for(var e=0,f=this.folderlist.length;e<f;e++)if(b==this.folderlist.options[e].value){this.folderlist.selectedIndex=e,a(this.folderlist).trigger("liszt:updated").trigger("chosen:updated");break}(c||d)&&this.setFrameUrl(b,c,d)},upFolder:function(){var a,b=this.folderlist.value.split("/");b.pop(),a=b.join("/"),this.setFolder(a),this.setFrameUrl(a)},populateFields:function(b){a.each(a("a.img-preview",a("#imageframe").contents()),function(c,d){d.href=="javascript:ImageManager.populateFields('"+b+"')"?a(d,a("#imageframe").contents()).addClass("selected"):a(d,a("#imageframe").contents()).removeClass("selected")}),a("#f_url").val(image_base_path+b)},showMessage:function(b){var c=a("#message");c.find(">:first-child").remove(),c.append(b),a("#messages").css("display","block")},refreshFrame:function(){this.frame.location.href=this.frameurl},setFrameUrl:function(b,c,d){var e={option:"com_media",view:"imagesList",tmpl:"component",asset:c,author:d};this.frameurl="index.php?"+a.param(e)+"&folder="+b,this.frame.location.href=this.frameurl},getQueryObject:function(b){var c={};return a.each((b||"").split(/[&;]/),function(a,b){var d=b.split("=");c[d[0]]=2==d.length?d[1]:null}),c},getUriObject:function(b){var c={},d=b.match(/^(?:([^:\/?#.]+):)?(?:\/\/)?(([^:\/?#]*)(?::(\d*))?)((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[\?#]|$)))*\/?)?([^?#\/]*))?(?:\?([^#]*))?(?:#(.*))?/);return a.each(["uri","scheme","authority","domain","port","path","directory","file","query","fragment"],function(a,b){c[b]=d&&d[a]?d[a]:""}),c}},a(function(){window.ImageManager.initialize()})}(jQuery,document);
\ No newline at end of file
+!function(a,b){"use strict";window.ImageManager={initialize:function(){var c=this.getUriObject(window.self.location.href),d=this.getQueryObject(c.query);this.editor=decodeURIComponent(d.e_name),this.fields={url:b.getElementById("f_url"),alt:b.getElementById("f_alt"),align:b.getElementById("f_align"),title:b.getElementById("f_title"),caption:b.getElementById("f_caption"),c_class:b.getElementById("f_caption_class")},this.folderlist=b.getElementById("folderlist"),this.frame=window.frames.imageframe,this.frameurl=this.frame.location.href,a("#imageframe").on("load",function(){ImageManager.onloadimageview()}),a("#upbutton").off("click").on("click",function(){ImageManager.upFolder()})},onloadimageview:function(){var b,c,d=this.getImageFolder(),e=a("#uploadForm"),f="";this.frameurl=this.frame.location.href,this.setFolder(d),b=this.getUriObject(e.attr("action")),c=this.getQueryObject(b.query),c.folder=d,b.query=a.param(c),"undefined"!=typeof b.port&&80!=b.port&&(f=":"+b.port),e.attr("action",b.scheme+"://"+b.domain+f+b.path+"?"+b.query)},getImageFolder:function(){return this.getQueryObject(this.frame.location.search.substring(1)).folder},onok:function(){var a="",b=[],c="",d="",e=this.fields.url.value,f=this.fields.alt.value,g=this.fields.align.value,h=this.fields.title.value,i=this.fields.caption.value,j=this.fields.c_class.value;return e&&(b.push('alt="'+f+'"'),g&&!i&&b.push('class="float-xs-'+g+'"'),h&&b.push('title="'+h+'"'),a='<img src="'+e+'" '+b.join(" ")+"/>",i&&(g&&(c=' class="float-xs-'+g+'"'),j&&(d=' class="'+j+'"'),a="<figure"+c+">"+a+"<figcaption"+d+">"+i+"</figcaption></figure>")),window.parent.Joomla.editors.instances[this.editor].replaceSelection(a),window.parent.Joomla.UI.Modal.close(),!0},setFolder:function(b,c,d){for(var e=0,f=this.folderlist.length;e<f;e++)if(b==this.folderlist.options[e].value){this.folderlist.selectedIndex=e,a(this.folderlist).trigger("liszt:updated").trigger("chosen:updated");break}(c||d)&&this.setFrameUrl(b,c,d)},upFolder:function(){var a,b=this.folderlist.value.split("/");b.pop(),a=b.join("/"),this.setFolder(a),this.setFrameUrl(a)},populateFields:function(b){a.each(a("a.img-preview",a("#imageframe").contents()),function(c,d){d.href=="javascript:ImageManager.populateFields('"+b+"')"?a(d,a("#imageframe").contents()).addClass("selected"):a(d,a("#imageframe").contents()).removeClass("selected")}),a("#f_url").val(image_base_path+b)},showMessage:function(b){var c=a("#message");c.find(">:first-child").remove(),c.append(b),a("#messages").css("display","block")},refreshFrame:function(){this.frame.location.href=this.frameurl},setFrameUrl:function(b,c,d){var e={option:"com_media",view:"imagesList",tmpl:"component",asset:c,author:d};this.frameurl="index.php?"+a.param(e)+"&folder="+b,this.frame.location.href=this.frameurl},getQueryObject:function(b){var c={};return a.each((b||"").split(/[&;]/),function(a,b){var d=b.split("=");c[d[0]]=2==d.length?d[1]:null}),c},getUriObject:function(b){var c={},d=b.match(/^(?:([^:\/?#.]+):)?(?:\/\/)?(([^:\/?#]*)(?::(\d*))?)((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[\?#]|$)))*\/?)?([^?#\/]*))?(?:\?([^#]*))?(?:#(.*))?/);return a.each(["uri","scheme","authority","domain","port","path","directory","file","query","fragment"],function(a,b){c[b]=d&&d[a]?d[a]:""}),c}},a(function(){window.ImageManager.initialize()})}(jQuery,document);
\ No newline at end of file
diff --git a/media/system/js/bootstrap-init.js b/media/system/js/bootstrap-init.js
index c09bfdbd97bb4..b3f4401d470d9 100644
--- a/media/system/js/bootstrap-init.js
+++ b/media/system/js/bootstrap-init.js
@@ -1,4 +1,12 @@
-;(function() {
+/**
+ * @copyright  Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+Joomla = window.Joomla || {};
+Joomla.UI = Joomla.UI || {};
+
+(function(window, Joomla) {
 	"use strict";
 
 	jQuery(document).ready(function($) {
@@ -99,6 +107,15 @@
 					$('.modalTooltip').tooltip('destroy');
 				});
 			});
+
+			// API used to be jModalClose
+			if(!Joomla.UI.Modal.close) {
+				Joomla.UI.Modal = {
+					close: function() {
+						jQuery('.joomla-modal.modal.fade.show').modal('hide');
+					}
+				}
+			}
 		}
 
 		/** Popover **/
@@ -143,4 +160,4 @@
 			});
 		}
 	});
-})();
+})(window, Joomla);
diff --git a/media/system/js/bootstrap-init.min.js b/media/system/js/bootstrap-init.min.js
index ed66e6e438060..78ff6c1f168fc 100644
--- a/media/system/js/bootstrap-init.min.js
+++ b/media/system/js/bootstrap-init.min.js
@@ -1 +1 @@
-!function(){"use strict";jQuery(document).ready(function(a){var b=Joomla.getOptions("bootstrap.accordion"),c=Joomla.getOptions("bootstrap.alert"),d=Joomla.getOptions("bootstrap.button"),e=Joomla.getOptions("bootstrap.carousel"),f=Joomla.getOptions("bootstrap.dropdown"),g=a(".joomla-modal"),h=Joomla.getOptions("bootstrap.popover"),i=Joomla.getOptions("bootstrap.scrollspy"),j=Joomla.getOptions("bootstrap.tabs"),k=Joomla.getOptions("bootstrap.tooltip");b&&a.each(b,function(b,c){a("#"+b).collapse({parent:c.parent,toggle:c.toggle}).on("show",new Function(c.onShow)()).on("shown",new Function(c.onShown)()).on("hideme",new Function(c.onHide)()).on("hidden",new Function(c.onHidden)())}),c&&a.each(c,function(b,c){a("#"+b).alert()}),d&&a.each(d,function(b,c){a("#"+b).button()}),e&&a.each(e,function(b,c){a("#"+b).carousel({interval:c.interval?c.interval:5e3,pause:c.pause?c.pause:"hover"})}),f&&a.each(f,function(b,c){a("#"+b).dropdown()}),g.length&&a.each(a(".joomla-modal"),function(){var b=a(this);b.on("show.bs.modal",function(){if(b.data("url")){var a=b.find(".modal-body");a.find("iframe").remove(),a.prepend(b.data("iframe"))}}).on("shown.bs.modal",function(){var c=a("div.modal:visible").outerHeight(!0),d=a("div.modal-header:visible").outerHeight(!0),e=a("div.modal-body:visible").outerHeight(!0),f=a("div.modal-body:visible").height(),g=a("div.modal-footer:visible").outerHeight(!0),h=b.offsetTop,i=a(window).height()-2*h,j=e-f,k=i-(d+g+j);if(b.data("url")){var l=a(".iframe").height();l>k&&(a(".modal-body").css({"max-height":k,"overflow-y":"auto"}),a(".iframe").css("max-height",k-j))}else c>i&&a(".modal-body").css({"max-height":k,"overflow-y":"auto"})}).on("hide.bs.modal",function(){a(".modal-body").css({"max-height":"initial","overflow-y":"initial"}),a(".modalTooltip").tooltip("destroy")})}),h&&a.each(h,function(b,c){c.constraints=[c.constraints],a(b).popover(c)}),i&&a.each(i,function(b,c){a("#"+b).scrollspy(c)}),j&&a.each(j,function(b,c){a.each(a("#"+b+"Content").find(".tab-pane"),function(c,d){if(a(d).data("node")){var e=a(d).data("node").split("["),f=""!=e[0]?'class="nav-link '+e[0]+'"':'class="nav-link"';a("#"+b+"Tabs").append('<li class="nav-item"><a '+f+' href="#'+e[1]+'" data-toggle="tab">'+e[2]+"</a></li>")}})}),k&&a.each(k,function(b,c){c.constraints=[c.constraints],a(b).tooltip(c).on("show.bs.tooltip",new Function(c.onShow)()).on("shown.bs.tooltip",new Function(c.onShown)()).on("hide.bs.tooltip",new Function(c.onHide)()).on("hidden.bs.tooltip",new Function(c.onHidden)())})})}();
\ No newline at end of file
+Joomla=window.Joomla||{},Joomla.UI=Joomla.UI||{},function(a,b){"use strict";jQuery(document).ready(function(c){var d=b.getOptions("bootstrap.accordion"),e=b.getOptions("bootstrap.alert"),f=b.getOptions("bootstrap.button"),g=b.getOptions("bootstrap.carousel"),h=b.getOptions("bootstrap.dropdown"),i=c(".joomla-modal"),j=b.getOptions("bootstrap.popover"),k=b.getOptions("bootstrap.scrollspy"),l=b.getOptions("bootstrap.tabs"),m=b.getOptions("bootstrap.tooltip");d&&c.each(d,function(a,b){c("#"+a).collapse({parent:b.parent,toggle:b.toggle}).on("show",new Function(b.onShow)()).on("shown",new Function(b.onShown)()).on("hideme",new Function(b.onHide)()).on("hidden",new Function(b.onHidden)())}),e&&c.each(e,function(a,b){c("#"+a).alert()}),f&&c.each(f,function(a,b){c("#"+a).button()}),g&&c.each(g,function(a,b){c("#"+a).carousel({interval:b.interval?b.interval:5e3,pause:b.pause?b.pause:"hover"})}),h&&c.each(h,function(a,b){c("#"+a).dropdown()}),i.length&&(c.each(c(".joomla-modal"),function(){var b=c(this);b.on("show.bs.modal",function(){if(b.data("url")){var a=b.find(".modal-body");a.find("iframe").remove(),a.prepend(b.data("iframe"))}}).on("shown.bs.modal",function(){var d=c("div.modal:visible").outerHeight(!0),e=c("div.modal-header:visible").outerHeight(!0),f=c("div.modal-body:visible").outerHeight(!0),g=c("div.modal-body:visible").height(),h=c("div.modal-footer:visible").outerHeight(!0),i=b.offsetTop,j=c(a).height()-2*i,k=f-g,l=j-(e+h+k);if(b.data("url")){var m=c(".iframe").height();m>l&&(c(".modal-body").css({"max-height":l,"overflow-y":"auto"}),c(".iframe").css("max-height",l-k))}else d>j&&c(".modal-body").css({"max-height":l,"overflow-y":"auto"})}).on("hide.bs.modal",function(){c(".modal-body").css({"max-height":"initial","overflow-y":"initial"}),c(".modalTooltip").tooltip("destroy")})}),b.UI.Modal.close||(b.UI.Modal={close:function(){jQuery(".joomla-modal.modal.fade.show").modal("hide")}})),j&&c.each(j,function(a,b){b.constraints=[b.constraints],c(a).popover(b)}),k&&c.each(k,function(a,b){c("#"+a).scrollspy(b)}),l&&c.each(l,function(a,b){c.each(c("#"+a+"Content").find(".tab-pane"),function(b,d){if(c(d).data("node")){var e=c(d).data("node").split("["),f=""!=e[0]?'class="nav-link '+e[0]+'"':'class="nav-link"';c("#"+a+"Tabs").append('<li class="nav-item"><a '+f+' href="#'+e[1]+'" data-toggle="tab">'+e[2]+"</a></li>")}})}),m&&c.each(m,function(a,b){b.constraints=[b.constraints],c(a).tooltip(b).on("show.bs.tooltip",new Function(b.onShow)()).on("shown.bs.tooltip",new Function(b.onShown)()).on("hide.bs.tooltip",new Function(b.onHide)()).on("hidden.bs.tooltip",new Function(b.onHidden)())})})}(window,Joomla);
\ No newline at end of file
diff --git a/media/system/js/fields/mediafield.js b/media/system/js/fields/mediafield.js
index e4cc85b15824f..69fac32b44aef 100644
--- a/media/system/js/fields/mediafield.js
+++ b/media/system/js/fields/mediafield.js
@@ -196,68 +196,3 @@
 	});
 
 })(jQuery);
-
-// Compatibility with mootools modal layout
-function jInsertFieldValue(value, id) {
-	var $ = jQuery.noConflict();
-	var old_value = $("#" + id).val();
-	if (old_value != value) {
-		var $elem = $("#" + id);
-		$elem.val(value);
-		$elem.trigger("change");
-		if (typeof($elem.get(0).onchange) === "function") {
-			$elem.get(0).onchange();
-		}
-		jMediaRefreshPreview(id);
-	}
-}
-
-function jMediaRefreshPreview(id) {
-	var $ = jQuery.noConflict();
-	var value = $("#" + id).val();
-	var $img = $("#" + id + "_preview");
-	var basepath = $("#" + id).data("basepath");
-
-	if ($img.length) {
-		if (value) {
-			$img.attr("src", basepath + value);
-			$("#" + id + "_preview_empty").hide();
-			$("#" + id + "_preview_img").show()
-		} else {
-			$img.attr("src", "");
-			$("#" + id + "_preview_empty").show();
-			$("#" + id + "_preview_img").hide();
-		}
-	}
-}
-
-function jMediaRefreshPreviewTip(tip)
-{
-	var $ = jQuery.noConflict();
-	var $tip = $(tip);
-	var $img = $tip.find("img.media-preview");
-
-	$img.each(function(index, value) {
-		$tip.find("div.tip").css("max-width", "none");
-		var id = $(this).attr("id");
-		id = id.substring(0, id.length - "_preview".length);
-		jMediaRefreshPreview(id);
-		$tip.show(this);
-	});
-}
-
-// JQuery for tooltip for INPUT showing whole image path
-function jMediaRefreshImgpathTip(tip, els)
-{
-	var $ = jQuery.noConflict();
-	var $tip = $(tip);
-	$tip.css("max-width", "none");
-	var $imgpath = $(els).val();
-	$("#TipImgpath").html($imgpath);
-
-	if ($imgpath.length) {
-		$tip.show();
-	} else {
-		$tip.hide();
-	}
-}
diff --git a/media/system/js/fields/mediafield.min.js b/media/system/js/fields/mediafield.min.js
index ca89f0a6711dc..6ebbf9c1e2501 100644
--- a/media/system/js/fields/mediafield.min.js
+++ b/media/system/js/fields/mediafield.min.js
@@ -1 +1 @@
-function jInsertFieldValue(a,b){var c=jQuery.noConflict();if(c("#"+b).val()!=a){var d=c("#"+b);d.val(a),d.trigger("change"),"function"==typeof d.get(0).onchange&&d.get(0).onchange(),jMediaRefreshPreview(b)}}function jMediaRefreshPreview(a){var b=jQuery.noConflict(),c=b("#"+a).val(),d=b("#"+a+"_preview"),e=b("#"+a).data("basepath");d.length&&(c?(d.attr("src",e+c),b("#"+a+"_preview_empty").hide(),b("#"+a+"_preview_img").show()):(d.attr("src",""),b("#"+a+"_preview_empty").show(),b("#"+a+"_preview_img").hide()))}function jMediaRefreshPreviewTip(a){var b=jQuery.noConflict(),c=b(a);c.find("img.media-preview").each(function(a,d){c.find("div.tip").css("max-width","none");var e=b(this).attr("id");e=e.substring(0,e.length-"_preview".length),jMediaRefreshPreview(e),c.show(this)})}function jMediaRefreshImgpathTip(a,b){var c=jQuery.noConflict(),d=c(a);d.css("max-width","none");var e=c(b).val();c("#TipImgpath").html(e),e.length?d.show():d.hide()}!function(a){"use strict";Function.prototype.bind||(Function.prototype.bind=function(a){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var b=Array.prototype.slice.call(arguments,1),c=this,d=function(){},e=function(){return c.apply(this instanceof d&&a?this:a,b.concat(Array.prototype.slice.call(arguments)))};return d.prototype=this.prototype,e.prototype=new d,e}),a.fieldMedia=function(b,c){this.options=a.extend({},a.fieldMedia.defaults,c),this.$container=a(b),this.$modal=this.$container.find(this.options.modal),this.$modalBody=this.$modal.find(".modal-body"),this.$input=this.$container.find(this.options.input),this.$containerPreview=this.$container.find(this.options.previewContainer),this.$buttonSelect=this.$container.find(this.options.buttonSelect),this.$buttonClear=this.$container.find(this.options.buttonClear),this.$buttonSelect.on("click",this.modalOpen.bind(this)),this.$buttonClear.on("click",this.clearValue.bind(this)),this.$modal.on("hide",this.removeIframe.bind(this)),this.updatePreview()},a.fieldMedia.prototype.modalOpen=function(){var b=a("<iframe>",{name:"field-media-modal",src:this.options.url.replace("{field-media-id}",this.$input.attr("id")),width:this.options.modalWidth,height:this.options.modalHeight});this.$modalBody.append(b),this.$modal.modal("show"),a("body").addClass("modal-open");var c=this;b.on("load",function(){var b=a(this).contents();b.on("click",c.options.buttonSaveSelected,function(){var a=b.find("#f_url").val();a&&c.setValue(a),c.modalClose.call(c)}),b.on("click",".button-cancel",function(){a("body").removeClass("modal-open"),c.modalClose.bind(c)})})},a.fieldMedia.prototype.modalClose=function(){this.$modal.modal("hide"),a("body").removeClass("modal-open"),this.$modalBody.empty()},a.fieldMedia.prototype.removeIframe=function(){this.$modalBody.empty(),a("body").removeClass("modal-open")},a.fieldMedia.prototype.setValue=function(a){this.$input.val(a).trigger("change"),this.updatePreview()},a.fieldMedia.prototype.clearValue=function(){this.setValue("")},a.fieldMedia.prototype.updatePreview=function(){if(this.options.preview)if(this.options.preview&&!this.options.previewAsTooltip){var b=this.$input.val();if(b){var c=new Image;c.src=this.options.basepath+b,c.width>c.height?this.$containerPreview.html(a("<img>",{src:c.src,style:"width: "+this.options.previewWidth+"px"})):this.$containerPreview.html(a("<img>",{src:c.src,style:"height: "+this.options.previewHeight+"px"}))}else this.$containerPreview.append("")}else{this.$containerPreview.popover("dispose"),this.$input.tooltip("dispose");var b=this.$input.val();if(b){var c=new Image(this.options.previewWidth,this.options.previewHeight);c.src=this.options.basepath+b,this.$containerPreview.popover({content:c}),this.$input.tooltip({placement:"top",title:b})}else this.$containerPreview.popover()}},a.fieldMedia.defaults={basepath:"",buttonClear:".button-clear",buttonSelect:".button-select",buttonSaveSelected:".button-save-selected",input:".field-media-input",preview:!0,previewAsTooltip:!0,previewContainer:".field-media-preview",previewWidth:200,previewHeight:200,url:"index.php?option=com_media&tmpl=component",modal:".modal",modalWidth:"100%",modalHeight:"300px"},a.fn.fieldMedia=function(b){return this.each(function(){var b=a(this),c=b.data("fieldMedia");if(!c){var d=d||{},e=b.data();for(var f in e)e.hasOwnProperty(f)&&(d[f]=e[f]);c=new a.fieldMedia(this,d),b.data("fieldMedia",c)}})},a(document).ready(function(){a(".field-media-wrapper").fieldMedia()})}(jQuery);
\ No newline at end of file
+!function(a){"use strict";Function.prototype.bind||(Function.prototype.bind=function(a){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var b=Array.prototype.slice.call(arguments,1),c=this,d=function(){},e=function(){return c.apply(this instanceof d&&a?this:a,b.concat(Array.prototype.slice.call(arguments)))};return d.prototype=this.prototype,e.prototype=new d,e}),a.fieldMedia=function(b,c){this.options=a.extend({},a.fieldMedia.defaults,c),this.$container=a(b),this.$modal=this.$container.find(this.options.modal),this.$modalBody=this.$modal.find(".modal-body"),this.$input=this.$container.find(this.options.input),this.$containerPreview=this.$container.find(this.options.previewContainer),this.$buttonSelect=this.$container.find(this.options.buttonSelect),this.$buttonClear=this.$container.find(this.options.buttonClear),this.$buttonSelect.on("click",this.modalOpen.bind(this)),this.$buttonClear.on("click",this.clearValue.bind(this)),this.$modal.on("hide",this.removeIframe.bind(this)),this.updatePreview()},a.fieldMedia.prototype.modalOpen=function(){var b=a("<iframe>",{name:"field-media-modal",src:this.options.url.replace("{field-media-id}",this.$input.attr("id")),width:this.options.modalWidth,height:this.options.modalHeight});this.$modalBody.append(b),this.$modal.modal("show"),a("body").addClass("modal-open");var c=this;b.on("load",function(){var b=a(this).contents();b.on("click",c.options.buttonSaveSelected,function(){var a=b.find("#f_url").val();a&&c.setValue(a),c.modalClose.call(c)}),b.on("click",".button-cancel",function(){a("body").removeClass("modal-open"),c.modalClose.bind(c)})})},a.fieldMedia.prototype.modalClose=function(){this.$modal.modal("hide"),a("body").removeClass("modal-open"),this.$modalBody.empty()},a.fieldMedia.prototype.removeIframe=function(){this.$modalBody.empty(),a("body").removeClass("modal-open")},a.fieldMedia.prototype.setValue=function(a){this.$input.val(a).trigger("change"),this.updatePreview()},a.fieldMedia.prototype.clearValue=function(){this.setValue("")},a.fieldMedia.prototype.updatePreview=function(){if(this.options.preview)if(this.options.preview&&!this.options.previewAsTooltip){var b=this.$input.val();if(b){var c=new Image;c.src=this.options.basepath+b,c.width>c.height?this.$containerPreview.html(a("<img>",{src:c.src,style:"width: "+this.options.previewWidth+"px"})):this.$containerPreview.html(a("<img>",{src:c.src,style:"height: "+this.options.previewHeight+"px"}))}else this.$containerPreview.append("")}else{this.$containerPreview.popover("dispose"),this.$input.tooltip("dispose");var b=this.$input.val();if(b){var c=new Image(this.options.previewWidth,this.options.previewHeight);c.src=this.options.basepath+b,this.$containerPreview.popover({content:c}),this.$input.tooltip({placement:"top",title:b})}else this.$containerPreview.popover()}},a.fieldMedia.defaults={basepath:"",buttonClear:".button-clear",buttonSelect:".button-select",buttonSaveSelected:".button-save-selected",input:".field-media-input",preview:!0,previewAsTooltip:!0,previewContainer:".field-media-preview",previewWidth:200,previewHeight:200,url:"index.php?option=com_media&tmpl=component",modal:".modal",modalWidth:"100%",modalHeight:"300px"},a.fn.fieldMedia=function(b){return this.each(function(){var b=a(this),c=b.data("fieldMedia");if(!c){var d=d||{},e=b.data();for(var f in e)e.hasOwnProperty(f)&&(d[f]=e[f]);c=new a.fieldMedia(this,d),b.data("fieldMedia",c)}})},a(document).ready(function(){a(".field-media-wrapper").fieldMedia()})}(jQuery);
\ No newline at end of file
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 6006611dbf2f3..ee077474ed85d 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -51,9 +51,9 @@ class PlgEditorTinymce extends JPlugin
 	public function onInit()
 	{
 		JHtml::_('behavior.core');
-		JHtml::_('behavior.polyfill', array('event'), 'lt IE 9');
 		JHtml::_('script', $this->_basePath . '/tinymce.min.js', array('version' => 'auto'));
 		JHtml::_('script', 'editors/tinymce/tinymce.min.js', array('version' => 'auto', 'relative' => true));
+		JHtml::_('script', 'editors/tinymce/tiny-close.min.js', array('version' => 'auto', 'relative' => true));
 	}
 
 	/**
@@ -617,8 +617,6 @@ public function onDisplay(
 				$tempPath = str_replace(JComponentHelper::getParams('com_media')->get('image_path') . '/', '', $tempPath);
 			}
 
-			JText::script('PLG_TINY_ERR_UNSUPPORTEDBROWSER');
-
 			$scriptOptions['setCustomDir']    = $isSubDir;
 			$scriptOptions['mediaUploadPath'] = $tempPath;
 			$scriptOptions['uploadUri']       = $uploadUrl;
@@ -794,66 +792,39 @@ private function tinyButtons($name, $excluded)
 
 				// Now we can built the script
 				$tempConstructor = '!(function(){';
-
-				// Get the modal width/height
-				if ($options && is_scalar($options))
-				{
-					$tempConstructor .= '
-				var getBtnOptions = new Function("return ' . addslashes($options) . '"),
-					btnOptions = getBtnOptions(),
-					modalWidth = btnOptions.size && btnOptions.size.x ?  btnOptions.size.x : null,
-					modalHeight = btnOptions.size && btnOptions.size.y ?  btnOptions.size.y : null;';
-				}
-				else
-				{
-					$tempConstructor .= '
-				var btnOptions = {}, modalWidth = null, modalHeight = null;';
-				}
-
-				$tempConstructor .= "
-				editor.addButton(\"" . $name . "\", {
-					text: \"" . $title . "\",
-					title: \"" . $title . "\",
-					icon: \"" . $icon . "\",
-					onclick: function () {";
+				$tempConstructor .= "editor.addButton(\"" . $name . "\", {";
+				$tempConstructor .= "text: \"" . $title . "\",";
+				$tempConstructor .= "title: \"" . $title . "\",";
+				$tempConstructor .= "icon: \"" . $icon . "\",";
+				$tempConstructor .= "onclick: function () {";
 
 				if ($button->get('modal') || $href)
 				{
-					$tempConstructor .= "
-							var modalOptions = {
-								title  : \"" . $title . "\",
-								url : '" . $href . "',
-								buttons: [{
-									text   : \"Close\",
-									onclick: \"close\"
-								}]
-							}
-							if(modalWidth){
-								modalOptions.width = modalWidth;
-							}
-							if(modalHeight){
-								modalOptions.height = modalHeight;
-							}
-							editor.windowManager.open(modalOptions);";
+					$tempConstructor .= "var modalOptions = {";
+						$tempConstructor .= "title  : \"" . $title . "\",";
+						$tempConstructor .= "url : '" . $href . "',";
+						$tempConstructor .= "buttons: [{";
+							$tempConstructor .= "text   : \"Close\",";
+							$tempConstructor .= "onclick: \"close\"";
+						$tempConstructor .= "}]";
+					$tempConstructor .= "};";
+					$tempConstructor .= "modalOptions.width = parseInt(window.outerWidth * (parseInt(" . $options['modalWidth'] . ") /100))+ 'px';";
+					$tempConstructor .= "modalOptions.height = parseInt(window.outerHeight * (parseInt(" . $options['bodyHeight'] . ") /100))+ 'px';";
+					$tempConstructor .= "editor.windowManager.open(modalOptions);";
 
 					if ($onclick && ($button->get('modal') || $href))
 					{
-						$tempConstructor .= "\r\n
-						" . $onclick . "
-							";
+						$tempConstructor .= "$onclick";
 					}
 				}
 				else
 				{
-					$tempConstructor .= "\r\n
-						" . $onclick . "
-							";
+					$tempConstructor .= "$onclick";
 				}
 
-				$tempConstructor .= "
-					}
+				$tempConstructor .= "}
 				});
-			})();";
+				})();";
 
 				// The array with the toolbar buttons
 				$btnsNames[] = $name . ' | ';