diff --git a/administrator/components/com_associations/views/association/tmpl/edit.php b/administrator/components/com_associations/views/association/tmpl/edit.php
index 8f16892c4dd58..d4e6b689a5c78 100644
--- a/administrator/components/com_associations/views/association/tmpl/edit.php
+++ b/administrator/components/com_associations/views/association/tmpl/edit.php
@@ -22,7 +22,7 @@
 			'id'       => $this->referenceId,
 		);
 ?>
-<button id="toogle-left-panel" class="btn btn-small" 
+<button id="toogle-left-panel" class="btn btn-small"
 		data-show-reference="<?php echo JText::_('COM_ASSOCIATIONS_EDIT_SHOW_REFERENCE'); ?>"
 		data-hide-reference="<?php echo JText::_('COM_ASSOCIATIONS_EDIT_HIDE_REFERENCE'); ?>"><?php echo JText::_('COM_ASSOCIATIONS_EDIT_HIDE_REFERENCE'); ?>
 </button>
@@ -51,7 +51,7 @@
 					<?php echo $this->form->getInput('itemlanguage'); ?>
 				</div>
 				<iframe id="target-association" name="target-association"
-					data-url="<?php echo $this->defaultTargetSrc; ?>"
+					src="<?php echo $this->defaultTargetSrc; ?>"
 					height="400" width="400"
 					data-action="<?php echo $this->targetAction; ?>"
 					data-item="<?php echo $this->typeName; ?>"
diff --git a/media/com_associations/js/sidebyside-uncompressed.js b/media/com_associations/js/sidebyside-uncompressed.js
index 2f9b973572f2a..e1b66cc62cfff 100644
--- a/media/com_associations/js/sidebyside-uncompressed.js
+++ b/media/com_associations/js/sidebyside-uncompressed.js
@@ -156,7 +156,7 @@ jQuery(document).ready(function($) {
 	$('#reference-association').on('load', function() {
 
 		// Load Target Pane AFTER reference pane has loaded to prevent session conflict with checkout
-		document.getElementById('target-association').setAttribute('src', document.getElementById('target-association').getAttribute('data-url'));
+		document.getElementById('target-association').setAttribute('src', document.getElementById('target-association').getAttribute('src'));
 
 		// If copy button used
 		if ($(this).contents().find('#jform_id').val() !== this.getAttribute('data-id'))
diff --git a/media/com_associations/js/sidebyside.js b/media/com_associations/js/sidebyside.js
index 68695d5131439..8ce06d768b7d9 100644
--- a/media/com_associations/js/sidebyside.js
+++ b/media/com_associations/js/sidebyside.js
@@ -1 +1 @@
-jQuery(document).ready(function($){$("#toolbar-target").hide();$("#toolbar-copy").hide();Joomla.submitbutton=function(task){if(task==="association.cancel"){Joomla.submitform(task)}else if(task==="copy"){Joomla.loadingLayer("show");var targetLang=document.getElementById("target-association").getAttribute("data-language"),referlangInput=window.frames["reference-association"].document.getElementById("jform_language");referlangInput.removeAttribute("disabled");referlangInput.value=targetLang;window.frames["reference-association"].Joomla.submitbutton(document.getElementById("adminForm").getAttribute("data-associatedview")+".save2copy")}else if(task==="undo-association"){var reference=document.getElementById("reference-association");var target=document.getElementById("target-association");var referenceId=reference.getAttribute("data-id");var referenceLang=reference.getAttribute("data-language").replace(/-/,"_");var targetId=target.getAttribute("data-id");var targetLang=target.getAttribute("data-language").replace(/-/,"_");reference=$(reference).contents();target=$(target).contents();reference.find("#jform_associations_"+targetLang+"_id").val("");reference.find("#jform_associations_"+targetLang+"_name").val("");reference.find("#jform_associations_"+targetLang+"_chzn").remove();reference.find("#jform_associations_"+targetLang).val("").change().chosen();var lang="";$("#jform_itemlanguage option").each(function(){lang=$(this).val().split("|")[0];if(typeof lang!=="undefined"){lang=lang.replace(/-/,"_");target.find("#jform_associations_"+lang+"_id").val("");target.find("#jform_associations_"+lang+"_chzn").remove();target.find("#jform_associations_"+lang).val("").change().chosen()}});target.find("#jform_associations_"+referenceLang+"_id").val("");target.find("#jform_associations_"+referenceLang+"_name").val("");target.find("#jform_associations_"+referenceLang+"_chzn").remove();target.find("#jform_associations_"+referenceLang).val("").change().chosen();var currentSwitcher=$("#jform_itemlanguage").val();var currentLang=targetLang.replace(/_/,"-");$('#jform_itemlanguage option[value="'+currentSwitcher+'"]').val(currentLang+":0:add");$("#jform_itemlanguage").val("").change();$("#jform_itemlanguage").trigger("liszt:updated");Joomla.submitbutton("reference")}else{$("#"+task+"-association").contents().find("#jform_language").attr("disabled",false);window.frames[task+"-association"].Joomla.submitbutton(document.getElementById("adminForm").getAttribute("data-associatedview")+".apply")}return false};Joomla.loadingLayer("load");$(document).on("click","#toogle-left-panel",function(){var referenceHide=this.getAttribute("data-hide-reference");var referenceShow=this.getAttribute("data-show-reference");if($(this).text()===referenceHide){$(this).text(referenceShow)}else{$(this).text(referenceHide)}$("#left-panel").toggle();$("#right-panel").toggleClass("full-width")});$(document).on("change","#jform_itemlanguage",function(){var target=document.getElementById("target-association");var selected=$(this).val();if(selected!==""&&typeof selected!=="undefined"){target.setAttribute("data-action",selected.split(":")[2]);target.setAttribute("data-id",selected.split(":")[1]);target.setAttribute("data-language",selected.split(":")[0]);Joomla.loadingLayer("show");target.src=target.getAttribute("data-editurl")+"&task="+target.getAttribute("data-item")+"."+target.getAttribute("data-action")+"&id="+target.getAttribute("data-id")}else{$("#toolbar-target").hide();$("#toolbar-copy").hide();$("#select-change").addClass("hidden");$("#remove-assoc").addClass("hidden");target.setAttribute("data-action","");target.setAttribute("data-id","0");target.setAttribute("data-language","");target.src=""}});$("#reference-association").on("load",function(){document.getElementById('target-association').setAttribute('src', document.getElementById('target-association').getAttribute('data-url'));if($(this).contents().find("#jform_id").val()!==this.getAttribute("data-id")){var target=document.getElementById("target-association");target.src=target.getAttribute("data-editurl")+"&task="+target.getAttribute("data-item")+".edit"+"&id="+$(this).contents().find("#jform_id").val();this.src=this.getAttribute("data-editurl")+"&task="+this.getAttribute("data-item")+".edit"+"&id="+this.getAttribute("data-id")}var reference=$(this).contents();reference.find("#jform_language_chzn").remove();reference.find("#jform_language").attr("disabled",true).chosen();reference.find("#associations").find(".btn").remove();var parse="";$("#jform_itemlanguage option").each(function(){parse=$(this).val().split(":");if(typeof parse[0]!=="undefined"){langAssociation=parse[0].replace(/-/,"_");if(reference.find("#jform_associations_"+langAssociation+"_id").val()==""){reference.find("#jform_associations_"+langAssociation+"_name").val(document.getElementById("reference-association").getAttribute("data-no-assoc"))}}});Joomla.loadingLayer("hide")});$("#target-association").on("load",function(){if(this.getAttribute("src")!=""){$("#toolbar-target").show();$("#toolbar-copy").show();$("#select-change").removeClass("hidden");var targetLanguage=this.getAttribute("data-language");var targetId=this.getAttribute("data-id");var targetLoadedId=$(this).contents().find("#jform_id").val()||"0";$(this).contents().find('a[href="#associations"]').parent().find(".btn").remove();$(this).contents().find("#associations").find(".btn").remove();if($(this).contents().find("#associations").hasClass("active")){$(this).contents().find('a[href="#associations"]').parent().removeClass("active");$(this).contents().find("#associations").removeClass("active");$(this).contents().find(".nav-tabs").find("li").first().addClass("active");$(this).contents().find(".tab-content").find(".tab-pane").first().addClass("active")}$(this).contents().find("#jform_language_chzn").remove();$(this).contents().find("#jform_language").val(targetLanguage).change().attr("disabled",true).chosen();if(targetLoadedId=="0"){document.getElementById("select-change-text").innerHTML=document.getElementById("select-change").getAttribute("data-select")}else{document.getElementById("select-change-text").innerHTML=document.getElementById("select-change").getAttribute("data-change");$("#remove-assoc").removeClass("hidden");$("#toolbar-copy").hide();var currentIdList=document.getElementById("target-id").value;var updatedList=currentIdList==""?targetLoadedId:currentIdList+","+targetLoadedId;document.getElementById("target-id").value=updatedList;if(targetLoadedId!=targetId){$('#jform_itemlanguage option[value^="'+targetLanguage+":"+targetId+':add"]').val(targetLanguage+":"+targetLoadedId+":edit");this.setAttribute("data-id",targetLoadedId);this.setAttribute("data-action","edit")}var reference=document.getElementById("reference-association");var languageCode=targetLanguage.replace(/-/,"_");var title=$(this).contents().find("#jform_title").val();$(reference).contents().find("#jform_associations_"+languageCode+"_id").val(targetLoadedId);$(reference).contents().find("#jform_associations_"+languageCode+"_name").val(title);$(reference).contents().find("#jform_associations_"+languageCode+"_chzn").remove();$(reference).contents().find("#jform_associations_"+languageCode).append('<option value="'+targetLoadedId+'">'+title+"</option>");$(reference).contents().find("#jform_associations_"+languageCode).val(targetLoadedId).change().chosen()}var reference=document.getElementById("reference-association");var referenceId=reference.getAttribute("data-id");var languageCode=reference.getAttribute("data-language").replace(/-/,"_");var title=$(reference).contents().find("#jform_title").val();var target=$(this).contents();target.find("#jform_associations_"+languageCode+"_id").val(referenceId);target.find("#jform_associations_"+languageCode+"_name").val(title);target.find("#jform_associations_"+languageCode+"_chzn").remove();var chznField=target.find("#jform_associations_"+languageCode);chznField.append('<option value="'+referenceId+'">'+title+"</option>");chznField.val(referenceId).change().chosen();var parse,langAssociation;$("#jform_itemlanguage option").each(function(){parse=$(this).val().split(":");if(typeof parse[1]!=="undefined"&&parse[1]!=="0"){langAssociation=parse[0].replace(/-/,"_");target.find("#jform_associations_"+langAssociation+"_id").val(parse[1]);target.find("#jform_associations_"+langAssociation+"_chzn").remove();chznField=target.find("#jform_associations_"+langAssociation);chznField.append('<option value="'+parse[1]+'"></option>');chznField.val(parse[1]).change().chosen()}});Joomla.loadingLayer("hide")}})});
\ No newline at end of file
+jQuery(document).ready(function(t){t("#toolbar-target").hide(),t("#toolbar-copy").hide(),Joomla.submitbutton=function(e){if("association.cancel"===e)Joomla.submitform(e);else if("copy"===e){Joomla.loadingLayer("show");var a=document.getElementById("target-association").getAttribute("data-language"),i=window.frames["reference-association"].document.getElementById("jform_language");i.removeAttribute("disabled"),i.value=a,window.frames["reference-association"].Joomla.submitbutton(document.getElementById("adminForm").getAttribute("data-associatedview")+".save2copy")}else if("undo-association"===e){var n=document.getElementById("reference-association"),o=document.getElementById("target-association"),s=(n.getAttribute("data-id"),n.getAttribute("data-language").replace(/-/,"_")),a=(o.getAttribute("data-id"),o.getAttribute("data-language").replace(/-/,"_"));n=t(n).contents(),o=t(o).contents(),n.find("#jform_associations_"+a+"_id").val(""),n.find("#jform_associations_"+a+"_name").val(""),n.find("#jform_associations_"+a+"_chzn").remove(),n.find("#jform_associations_"+a).val("").change().chosen();var d="";t("#jform_itemlanguage option").each(function(){d=t(this).val().split("|")[0],"undefined"!=typeof d&&(d=d.replace(/-/,"_"),o.find("#jform_associations_"+d+"_id").val(""),o.find("#jform_associations_"+d+"_chzn").remove(),o.find("#jform_associations_"+d).val("").change().chosen())}),o.find("#jform_associations_"+s+"_id").val(""),o.find("#jform_associations_"+s+"_name").val(""),o.find("#jform_associations_"+s+"_chzn").remove(),o.find("#jform_associations_"+s).val("").change().chosen();var r=t("#jform_itemlanguage").val(),c=a.replace(/_/,"-");t('#jform_itemlanguage option[value="'+r+'"]').val(c+":0:add"),t("#jform_itemlanguage").val("").change(),t("#jform_itemlanguage").trigger("liszt:updated"),Joomla.submitbutton("reference")}else t("#"+e+"-association").contents().find("#jform_language").attr("disabled",!1),window.frames[e+"-association"].Joomla.submitbutton(document.getElementById("adminForm").getAttribute("data-associatedview")+".apply");return!1},Joomla.loadingLayer("load"),t(document).on("click","#toogle-left-panel",function(){var e=this.getAttribute("data-hide-reference"),a=this.getAttribute("data-show-reference");t(this).text()===e?t(this).text(a):t(this).text(e),t("#left-panel").toggle(),t("#right-panel").toggleClass("full-width")}),t(document).on("change","#jform_itemlanguage",function(){var e=document.getElementById("target-association"),a=t(this).val();""!==a&&"undefined"!=typeof a?(e.setAttribute("data-action",a.split(":")[2]),e.setAttribute("data-id",a.split(":")[1]),e.setAttribute("data-language",a.split(":")[0]),Joomla.loadingLayer("show"),e.src=e.getAttribute("data-editurl")+"&task="+e.getAttribute("data-item")+"."+e.getAttribute("data-action")+"&id="+e.getAttribute("data-id")):(t("#toolbar-target").hide(),t("#toolbar-copy").hide(),t("#select-change").addClass("hidden"),t("#remove-assoc").addClass("hidden"),e.setAttribute("data-action",""),e.setAttribute("data-id","0"),e.setAttribute("data-language",""),e.src="")}),t("#reference-association").on("load",function(){if(document.getElementById("target-association").setAttribute("src",document.getElementById("target-association").getAttribute("src")),t(this).contents().find("#jform_id").val()!==this.getAttribute("data-id")){var e=document.getElementById("target-association");e.src=e.getAttribute("data-editurl")+"&task="+e.getAttribute("data-item")+".edit&id="+t(this).contents().find("#jform_id").val(),this.src=this.getAttribute("data-editurl")+"&task="+this.getAttribute("data-item")+".edit&id="+this.getAttribute("data-id")}var a=t(this).contents();a.find("#jform_language_chzn").remove(),a.find("#jform_language").attr("disabled",!0).chosen(),a.find("#associations").find(".btn").remove();var i="";t("#jform_itemlanguage option").each(function(){i=t(this).val().split(":"),"undefined"!=typeof i[0]&&(langAssociation=i[0].replace(/-/,"_"),""==a.find("#jform_associations_"+langAssociation+"_id").val()&&a.find("#jform_associations_"+langAssociation+"_name").val(document.getElementById("reference-association").getAttribute("data-no-assoc")))}),Joomla.loadingLayer("hide")}),t("#target-association").on("load",function(){if(""!=this.getAttribute("src")){t("#toolbar-target").show(),t("#toolbar-copy").show(),t("#select-change").removeClass("hidden");var e=this.getAttribute("data-language"),a=this.getAttribute("data-id"),i=t(this).contents().find("#jform_id").val()||"0";if(t(this).contents().find('a[href="#associations"]').parent().find(".btn").remove(),t(this).contents().find("#associations").find(".btn").remove(),t(this).contents().find("#associations").hasClass("active")&&(t(this).contents().find('a[href="#associations"]').parent().removeClass("active"),t(this).contents().find("#associations").removeClass("active"),t(this).contents().find(".nav-tabs").find("li").first().addClass("active"),t(this).contents().find(".tab-content").find(".tab-pane").first().addClass("active")),t(this).contents().find("#jform_language_chzn").remove(),t(this).contents().find("#jform_language").val(e).change().attr("disabled",!0).chosen(),"0"==i)document.getElementById("select-change-text").innerHTML=document.getElementById("select-change").getAttribute("data-select");else{document.getElementById("select-change-text").innerHTML=document.getElementById("select-change").getAttribute("data-change"),t("#remove-assoc").removeClass("hidden"),t("#toolbar-copy").hide();var n=document.getElementById("target-id").value,o=""==n?i:n+","+i;document.getElementById("target-id").value=o,i!=a&&(t('#jform_itemlanguage option[value^="'+e+":"+a+':add"]').val(e+":"+i+":edit"),this.setAttribute("data-id",i),this.setAttribute("data-action","edit"));var s=document.getElementById("reference-association"),d=e.replace(/-/,"_"),r=t(this).contents().find("#jform_title").val();t(s).contents().find("#jform_associations_"+d+"_id").val(i),t(s).contents().find("#jform_associations_"+d+"_name").val(r),t(s).contents().find("#jform_associations_"+d+"_chzn").remove(),t(s).contents().find("#jform_associations_"+d).append('<option value="'+i+'">'+r+"</option>"),t(s).contents().find("#jform_associations_"+d).val(i).change().chosen()}var s=document.getElementById("reference-association"),c=s.getAttribute("data-id"),d=s.getAttribute("data-language").replace(/-/,"_"),r=t(s).contents().find("#jform_title").val(),l=t(this).contents();l.find("#jform_associations_"+d+"_id").val(c),l.find("#jform_associations_"+d+"_name").val(r),l.find("#jform_associations_"+d+"_chzn").remove();var m=l.find("#jform_associations_"+d);m.append('<option value="'+c+'">'+r+"</option>"),m.val(c).change().chosen();var f,g;t("#jform_itemlanguage option").each(function(){f=t(this).val().split(":"),"undefined"!=typeof f[1]&&"0"!==f[1]&&(g=f[0].replace(/-/,"_"),l.find("#jform_associations_"+g+"_id").val(f[1]),l.find("#jform_associations_"+g+"_chzn").remove(),m=l.find("#jform_associations_"+g),m.append('<option value="'+f[1]+'"></option>'),m.val(f[1]).change().chosen())}),Joomla.loadingLayer("hide")}})});
\ No newline at end of file