Throw error about Popper.js only when it's needed because some of our…

… plugins don't use it (#24573)
twbs · Oct 29, 2017 · 2232b6b · 2232b6b
1 parent e454c8e
commit 2232b6b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/js/src/dropdown.js b/js/src/dropdown.js
@@ -12,14 +12,6 @@ import Util from './util'
 
 const Dropdown = (($) => {
 
-  /**
-   * Check for Popper dependency
-   * Popper - https://popper.js.org
-   */
-  if (typeof Popper === 'undefined') {
-    throw new Error('Bootstrap dropdown require Popper.js (https://popper.js.org)')
-  }
-
   /**
    * ------------------------------------------------------------------------
    * Constants
@@ -151,6 +143,14 @@ const Dropdown = (($) => {
         return
       }
 
+      /**
+       * Check for Popper dependency
+       * Popper - https://popper.js.org
+       */
+      if (typeof Popper === 'undefined') {
+        throw new Error('Bootstrap dropdown require Popper.js (https://popper.js.org)')
+      }
+
       let element = this._element
       // for dropup with alignment we use the parent as popper container
       if ($(parent).hasClass(ClassName.DROPUP)) {

diff --git a/js/src/tooltip.js b/js/src/tooltip.js
@@ -12,15 +12,6 @@ import Util from './util'
 
 const Tooltip = (($) => {
 
-  /**
-   * Check for Popper dependency
-   * Popper - https://popper.js.org
-   */
-  if (typeof Popper === 'undefined') {
-    throw new Error('Bootstrap tooltips require Popper.js (https://popper.js.org)')
-  }
-
-
   /**
    * ------------------------------------------------------------------------
    * Constants
@@ -120,6 +111,13 @@ const Tooltip = (($) => {
   class Tooltip {
 
     constructor(element, config) {
+      /**
+       * Check for Popper dependency
+       * Popper - https://popper.js.org
+       */
+      if (typeof Popper === 'undefined') {
+        throw new Error('Bootstrap tooltips require Popper.js (https://popper.js.org)')
+      }
 
       // private
       this._isEnabled     = true