Fix merge conflicts

joomla · Mar 27, 2017 · bc59cf8 · bc59cf8
2 parents fbdc523 + 77e32b0
commit bc59cf8
Show file tree

Hide file tree

Showing 36 changed files with 38 additions and 4 deletions.
diff --git a/media/com_installer/js/installer.js b/media/com_installer/js/installer.js
@@ -81,9 +81,9 @@
 			}
 		};
 
-		var loading = document.getElementById('loading');
-		if (loading) {
-			var installer = document.getElementById('installer-install');
+		var loading   = document.getElementById('loading'),
+		    installer = document.getElementById('installer-install');
+		if (loading && installer) {
 			loading.style.top = parseInt(installer.offsetTop - window.pageYOffset);
 			loading.style.left = 0;
 			loading.style.width = '100%';
@@ -95,4 +95,3 @@
 	});
 
 })();
-
diff --git a/media/system/js/fields/calendar-locales/af.min.js b/media/system/js/fields/calendar-locales/af.min.js
diff --git a/media/system/js/fields/calendar-locales/ar.min.js b/media/system/js/fields/calendar-locales/ar.min.js
diff --git a/media/system/js/fields/calendar-locales/bg.min.js b/media/system/js/fields/calendar-locales/bg.min.js
diff --git a/media/system/js/fields/calendar-locales/bs.min.js b/media/system/js/fields/calendar-locales/bs.min.js
diff --git a/media/system/js/fields/calendar-locales/ca.min.js b/media/system/js/fields/calendar-locales/ca.min.js
diff --git a/media/system/js/fields/calendar-locales/cs.min.js b/media/system/js/fields/calendar-locales/cs.min.js
diff --git a/media/system/js/fields/calendar-locales/cy.min.js b/media/system/js/fields/calendar-locales/cy.min.js
diff --git a/media/system/js/fields/calendar-locales/da.min.js b/media/system/js/fields/calendar-locales/da.min.js
diff --git a/media/system/js/fields/calendar-locales/de.min.js b/media/system/js/fields/calendar-locales/de.min.js
diff --git a/media/system/js/fields/calendar-locales/el.min.js b/media/system/js/fields/calendar-locales/el.min.js
diff --git a/media/system/js/fields/calendar-locales/en.min.js b/media/system/js/fields/calendar-locales/en.min.js
diff --git a/media/system/js/fields/calendar-locales/es.min.js b/media/system/js/fields/calendar-locales/es.min.js
diff --git a/media/system/js/fields/calendar-locales/eu.min.js b/media/system/js/fields/calendar-locales/eu.min.js
diff --git a/media/system/js/fields/calendar-locales/fa-ir.min.js b/media/system/js/fields/calendar-locales/fa-ir.min.js
diff --git a/media/system/js/fields/calendar-locales/fr.min.js b/media/system/js/fields/calendar-locales/fr.min.js
diff --git a/media/system/js/fields/calendar-locales/ga.min.js b/media/system/js/fields/calendar-locales/ga.min.js
diff --git a/media/system/js/fields/calendar-locales/hr.min.js b/media/system/js/fields/calendar-locales/hr.min.js
diff --git a/media/system/js/fields/calendar-locales/hu.min.js b/media/system/js/fields/calendar-locales/hu.min.js
diff --git a/media/system/js/fields/calendar-locales/it.min.js b/media/system/js/fields/calendar-locales/it.min.js
diff --git a/media/system/js/fields/calendar-locales/ja.min.js b/media/system/js/fields/calendar-locales/ja.min.js
diff --git a/media/system/js/fields/calendar-locales/ka.min.js b/media/system/js/fields/calendar-locales/ka.min.js
diff --git a/media/system/js/fields/calendar-locales/ko.min.js b/media/system/js/fields/calendar-locales/ko.min.js
diff --git a/media/system/js/fields/calendar-locales/mk.min.js b/media/system/js/fields/calendar-locales/mk.min.js
diff --git a/media/system/js/fields/calendar-locales/nb.min.js b/media/system/js/fields/calendar-locales/nb.min.js
diff --git a/media/system/js/fields/calendar-locales/nl.min.js b/media/system/js/fields/calendar-locales/nl.min.js
diff --git a/media/system/js/fields/calendar-locales/prs-af.min.js b/media/system/js/fields/calendar-locales/prs-af.min.js
diff --git a/media/system/js/fields/calendar-locales/pt.min.js b/media/system/js/fields/calendar-locales/pt.min.js
diff --git a/media/system/js/fields/calendar-locales/sk.min.js b/media/system/js/fields/calendar-locales/sk.min.js
diff --git a/media/system/js/fields/calendar-locales/sl.min.js b/media/system/js/fields/calendar-locales/sl.min.js
diff --git a/media/system/js/fields/calendar-locales/sr-rs.min.js b/media/system/js/fields/calendar-locales/sr-rs.min.js