Merge branch 'feature/fix-adv-search-layout' into develop

Gemfile

@@ -86,7 +86,7 @@ gem 'noticed', '~> 1.4'
 # Reporting
 gem 'blazer'
 gem 'chronic'
-gem 'i18n-js'
+gem 'i18n-js', '~> 3.0'
 gem 'momentjs-rails'
 gem 'rsolr'
 

Gemfile.lock

@@ -204,7 +204,6 @@ GEM
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
     geocoder (1.8.1)
-    glob (0.3.1)
     globalid (1.0.0)
       activesupport (>= 5.0)
     haml (5.2.2)
@@ -228,9 +227,8 @@ GEM
     httpclient (2.8.3)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    i18n-js (4.0.1)
-      glob
-      i18n
+    i18n-js (3.9.2)
+      i18n (>= 0.6.6)
     inline_svg (1.8.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
@@ -565,7 +563,7 @@ DEPENDENCIES
   haml (~> 5.2.0)
   hashdiff
   httparty
-  i18n-js
+  i18n-js (~> 3.0)
   inline_svg
   jbuilder (~> 2.7)
   jquery-rails (~> 4.4)

app/views/shared/_js_behaviors.html.erb

@@ -1,6 +1,8 @@
 <script>
   $(function () {
-    $('[data-toggle="tooltip"]').tooltip()
+    if ($('[data-toggle="tooltip"]').length > 0) {
+      $('[data-toggle="tooltip"]').tooltip();
+    }
   });
 
   // Date Range picker

package.json

@@ -10,7 +10,7 @@
     "bootstrap-datepicker": "^1.9.0",
     "devbridge-autocomplete": "^1.4.10",
     "highcharts": "^9.3.2",
-    "i18n": "^0.15.0",
+    "i18n": "^0.15.1",
     "inputmask": "^5.0.3",
     "node-forge": "^1.0.0",
     "popper.js": "^1.16.1",

yarn.lock

@@ -3437,10 +3437,10 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-i18n@^0.15.0:
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.15.0.tgz#dca7a498a4371874db01f6610381a412897306eb"
-  integrity sha512-TUOkuFbl8Y/q7zF0tHdtpk1/TtxH0T+Drp2NFrHhmN1Qs0Sob9/0uVLS2BPVkEXNh2jZrimOiFJk+tkaOumzog==
+i18n@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.15.1.tgz#68fb8993c461cc440bc2485d82f72019f2b92de8"
+  integrity sha512-yue187t8MqUPMHdKjiZGrX+L+xcUsDClGO0Cz4loaKUOK9WrGw5pgan4bv130utOwX7fHE9w2iUeHFalVQWkXA==
   dependencies:
     "@messageformat/core" "^3.0.0"
     debug "^4.3.3"
@@ -4375,9 +4375,9 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
 moo@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4"
-  integrity sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
+  integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
 
 move-concurrently@^1.0.1:
   version "1.0.1"