Merge branch '4.0-dev' into codemirror-markup

joomla · Dec 12, 2019 · 8abcd74 · 8abcd74
2 parents 55790a0 + 91e4829
commit 8abcd74
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-08-01.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-08-01.sql
@@ -3,6 +3,10 @@ ALTER TABLE `#__ucm_content` MODIFY `core_modified_time` datetime NOT NULL;
 
 ALTER TABLE `#__ucm_content` MODIFY `core_publish_up` datetime NULL DEFAULT NULL;
 ALTER TABLE `#__ucm_content` MODIFY `core_publish_down` datetime NULL DEFAULT NULL;
+
+-- Only on MySQL: Update empty strings to null date before converting the column from varchar to datetime
+UPDATE `#__ucm_content` SET `core_checked_out_time` = '0000-00-00 00:00:00' WHERE `core_checked_out_time` = '';
+
 ALTER TABLE `#__ucm_content` MODIFY `core_checked_out_time` datetime NULL DEFAULT NULL;
 
 ALTER TABLE `#__ucm_history` MODIFY `save_date` datetime NOT NULL;
diff --git a/build/media_source/com_associations/js/sidebyside.es5.js b/build/media_source/com_associations/js/sidebyside.es5.js
@@ -66,10 +66,12 @@ jQuery(document).ready(function($) {
       target.find('#jform_associations_' + referenceLang).val('');
 
       // Reset switcher after removing association
-      var currentSwitcher = $('#jform_itemlanguage').val();
+      var currentLangSelect = $('#jform_itemlanguage');
+      var currentSwitcher = currentLangSelect.val();
       var currentLang = targetLang.replace(/_/,'-');
       $('#jform_itemlanguage option[value=\"' + currentSwitcher + '\"]').val(currentLang + ':0:add');
-      $('#jform_itemlanguage').val('');
+      currentLangSelect.val('');
+      Joomla.Event.dispatch(currentLangSelect[0], 'change');
 
       // Save one of the items to confirm action
       Joomla.submitbutton('reference');
@@ -177,7 +179,9 @@ jQuery(document).ready(function($) {
 
     // Iframe load finished, hide Joomla loading layer.
     var spinner = document.querySelector('joomla-core-loader');
-    spinner.parentNode.removeChild(spinner);
+    if (spinner) {
+      spinner.parentNode.removeChild(spinner);
+    }
   });
 
   // Attach behaviour to target frame load event.
@@ -288,7 +292,9 @@ jQuery(document).ready(function($) {
 
       // Iframe load finished, hide Joomla loading layer.
       var spinner = document.querySelector('joomla-core-loader');
-      spinner.parentNode.removeChild(spinner);
+      if (spinner) {
+        spinner.parentNode.removeChild(spinner);
+      }
     }
   });
 });