diff options
| author | Somrat <monnaf37@gmail.com> | 2019-01-10 11:29:31 +0300 |
|---|---|---|
| committer | Somrat <monnaf37@gmail.com> | 2019-01-10 11:29:31 +0300 |
| commit | 81351c5df4400b892cdb25e7600f6332ec7e62a2 (patch) | |
| tree | 8f2f1f59ae00fa451c81496723e05d8cafa64e88 /assets | |
| parent | d96fd22dddacf444fdd826a54ddbac9d0ff2069e (diff) | |
| parent | 81ff0af42008e21a99a8eed470134ff5bb8247f1 (diff) | |
resolve conflict
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/js/script.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/assets/js/script.js b/assets/js/script.js index 246874a..4483b4b 100644 --- a/assets/js/script.js +++ b/assets/js/script.js @@ -63,7 +63,8 @@ jQuery(function ($) { /* Portfolio Filtering Hook /* ========================================================================= */ - var mixer = mixitup('.portfolio-items-wrapper'); + if ($('.portfolio-items-wrapper').length) + mixitup('.portfolio-items-wrapper'); /* ========================================================================= */ /* Testimonial Carousel @@ -305,4 +306,6 @@ function initialize() { map.setMapTypeId('roadatlas'); } -google.maps.event.addDomListener(window, "load", initialize);
\ No newline at end of file +// Check init google maps only if "google" has been defined. +if("google" in window) + google.maps.event.addDomListener(window, "load", initialize);
\ No newline at end of file |