Merge branch 'v4-dev' into collapse-js-with-text-truncate

js/dist/alert.js

@@ -41,14 +41,14 @@ var Alert = function () {
     ALERT: 'alert',
     FADE: 'fade',
     SHOW: 'show'
-
-    /**
-     * ------------------------------------------------------------------------
-     * Class Definition
-     * ------------------------------------------------------------------------
-     */
-
   };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
   var Alert = function () {
     function Alert(element) {
       _classCallCheck(this, Alert);

js/dist/button.js

@@ -43,14 +43,14 @@ var Button = function () {
   var Event = {
     CLICK_DATA_API: 'click' + EVENT_KEY + DATA_API_KEY,
     FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + DATA_API_KEY)
-
-    /**
-     * ------------------------------------------------------------------------
-     * Class Definition
-     * ------------------------------------------------------------------------
-     */
-
   };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
   var Button = function () {
     function Button(element) {
       _classCallCheck(this, Button);

js/dist/carousel.js

@@ -85,14 +85,14 @@ var Carousel = function () {
     INDICATORS: '.carousel-indicators',
     DATA_SLIDE: '[data-slide], [data-slide-to]',
     DATA_RIDE: '[data-ride="carousel"]'
-
-    /**
-     * ------------------------------------------------------------------------
-     * Class Definition
-     * ------------------------------------------------------------------------
-     */
-
   };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
   var Carousel = function () {
     function Carousel(element, config) {
       _classCallCheck(this, Carousel);

js/dist/collapse.js

@@ -62,14 +62,14 @@ var Collapse = function () {
   var Selector = {
     ACTIVES: '.show, .collapsing',
     DATA_TOGGLE: '[data-toggle="collapse"]'
-
-    /**
-     * ------------------------------------------------------------------------
-     * Class Definition
-     * ------------------------------------------------------------------------
-     */
-
   };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
   var Collapse = function () {
     function Collapse(element, config) {
       _classCallCheck(this, Collapse);

js/dist/dropdown.js

@@ -78,23 +78,21 @@ var Dropdown = function () {
   };
 
   var Default = {
-    placement: AttachmentMap.BOTTOM,
     offset: 0,
     flip: true
   };
 
   var DefaultType = {
-    placement: 'string',
     offset: '(number|string)',
     flip: 'boolean'
-
-    /**
-     * ------------------------------------------------------------------------
-     * Class Definition
-     * ------------------------------------------------------------------------
-     */
-
   };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
   var Dropdown = function () {
     function Dropdown(element, config) {
       _classCallCheck(this, Dropdown);
@@ -201,11 +199,6 @@ var Dropdown = function () {
     }, {
       key: '_getConfig',
       value: function _getConfig(config) {
-        var elementData = $(this._element).data();
-        if (typeof elementData.placement !== 'undefined') {
-          elementData.placement = AttachmentMap[elementData.placement.toUpperCase()];
-        }
-
         config = $.extend({}, this.constructor.Default, $(this._element).data(), config);
 
         Util.typeCheckConfig(NAME, config, this.constructor.DefaultType);
@@ -225,10 +218,10 @@ var Dropdown = function () {
       key: '_getPlacement',
       value: function _getPlacement() {
         var $parentDropdown = $(this._element).parent();
-        var placement = this._config.placement;
+        var placement = AttachmentMap.BOTTOM;
 
         // Handle dropup
-        if ($parentDropdown.hasClass(ClassName.DROPUP) || this._config.placement === AttachmentMap.TOP) {
+        if ($parentDropdown.hasClass(ClassName.DROPUP)) {
           placement = AttachmentMap.TOP;
           if ($(this._menu).hasClass(ClassName.MENURIGHT)) {
             placement = AttachmentMap.TOPEND;
@@ -256,9 +249,10 @@ var Dropdown = function () {
               enabled: this._config.flip
             }
           }
+        };
 
-          // Disable Popper.js for Dropdown in Navbar
-        };if (this._inNavbar) {
+        // Disable Popper.js for Dropdown in Navbar
+        if (this._inNavbar) {
           popperConfig.modifiers.applyStyle = {
             enabled: !this._inNavbar
           };

js/dist/modal.js

@@ -74,14 +74,14 @@ var Modal = function () {
     FIXED_CONTENT: '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top',
     STICKY_CONTENT: '.sticky-top',
     NAVBAR_TOGGLER: '.navbar-toggler'
-
-    /**
-     * ------------------------------------------------------------------------
-     * Class Definition
-     * ------------------------------------------------------------------------
-     */
-
   };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
   var Modal = function () {
     function Modal(element, config) {
       _classCallCheck(this, Modal);

js/dist/popover.js

@@ -65,14 +65,14 @@ var Popover = function () {
     FOCUSOUT: 'focusout' + EVENT_KEY,
     MOUSEENTER: 'mouseenter' + EVENT_KEY,
     MOUSELEAVE: 'mouseleave' + EVENT_KEY
-
-    /**
-     * ------------------------------------------------------------------------
-     * Class Definition
-     * ------------------------------------------------------------------------
-     */
-
   };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
   var Popover = function (_Tooltip) {
     _inherits(Popover, _Tooltip);
 

js/dist/scrollspy.js

@@ -66,14 +66,14 @@ var ScrollSpy = function () {
   var OffsetMethod = {
     OFFSET: 'offset',
     POSITION: 'position'
-
-    /**
-     * ------------------------------------------------------------------------
-     * Class Definition
-     * ------------------------------------------------------------------------
-     */
-
   };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
   var ScrollSpy = function () {
     function ScrollSpy(element, config) {
       var _this = this;

js/dist/tab.js

@@ -51,14 +51,14 @@ var Tab = function () {
     DATA_TOGGLE: '[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',
     DROPDOWN_TOGGLE: '.dropdown-toggle',
     DROPDOWN_ACTIVE_CHILD: '> .dropdown-menu .active'
-
-    /**
-     * ------------------------------------------------------------------------
-     * Class Definition
-     * ------------------------------------------------------------------------
-     */
-
   };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
   var Tab = function () {
     function Tab(element) {
       _classCallCheck(this, Tab);

js/dist/tooltip.js

@@ -108,14 +108,14 @@ var Tooltip = function () {
     FOCUS: 'focus',
     CLICK: 'click',
     MANUAL: 'manual'
-
-    /**
-     * ------------------------------------------------------------------------
-     * Class Definition
-     * ------------------------------------------------------------------------
-     */
-
   };
+
+  /**
+   * ------------------------------------------------------------------------
+   * Class Definition
+   * ------------------------------------------------------------------------
+   */
+
   var Tooltip = function () {
     function Tooltip(element, config) {
       _classCallCheck(this, Tooltip);

js/dist/util.js

@@ -24,9 +24,10 @@ var Util = function () {
     MozTransition: 'transitionend',
     OTransition: 'oTransitionEnd otransitionend',
     transition: 'transitionend'
+  };
 
-    // shoutout AngusCroll (https://goo.gl/pxwQGp)
-  };function toType(obj) {
+  // shoutout AngusCroll (https://goo.gl/pxwQGp)
+  function toType(obj) {
     return {}.toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
   }