Remove smartPlacement option since Popper handles it

sorich87 · Oct 8, 2017 · 6a1028f · 6a1028f
1 parent 755a26a
commit 6a1028f
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 31 deletions.
diff --git a/build/js/bootstrap-tour-standalone.js b/build/js/bootstrap-tour-standalone.js
@@ -4030,7 +4030,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
     };
 
     Tour.prototype._showPopover = function(step, i) {
-      var $element, $tip, isOrphan, options, shouldAddSmart;
+      var $element, $tip, isOrphan, options;
       $(".tour-" + this._options.name).remove();
       options = $.extend({}, this._options);
       isOrphan = this._isOrphan(step);
@@ -4055,9 +4055,8 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
           };
         })(this));
       }
-      shouldAddSmart = step.smartPlacement === true && step.placement.search(/auto/i) === -1;
       $element.popover({
-        placement: shouldAddSmart ? "auto " + step.placement : step.placement,
+        placement: step.placement,
         trigger: 'manual',
         title: step.title,
         content: step.content,

diff --git a/build/js/bootstrap-tour-standalone.min.js b/build/js/bootstrap-tour-standalone.min.js
diff --git a/build/js/bootstrap-tour.js b/build/js/bootstrap-tour.js
@@ -545,7 +545,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
     };
 
     Tour.prototype._showPopover = function(step, i) {
-      var $element, $tip, isOrphan, options, shouldAddSmart;
+      var $element, $tip, isOrphan, options;
       $(".tour-" + this._options.name).remove();
       options = $.extend({}, this._options);
       isOrphan = this._isOrphan(step);
@@ -570,9 +570,8 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
           };
         })(this));
       }
-      shouldAddSmart = step.smartPlacement === true && step.placement.search(/auto/i) === -1;
       $element.popover({
-        placement: shouldAddSmart ? "auto " + step.placement : step.placement,
+        placement: step.placement,
         trigger: 'manual',
         title: step.title,
         content: step.content,

diff --git a/build/js/bootstrap-tour.min.js b/build/js/bootstrap-tour.min.js
diff --git a/src/coffee/bootstrap-tour.coffee b/src/coffee/bootstrap-tour.coffee
@@ -502,11 +502,9 @@
         .on "#{@_reflexEvent(step.reflex)}.tour-#{@_options.name}", =>
           if @_isLast() then @next() else @end()
 
-      shouldAddSmart = step.smartPlacement is true and step.placement.search(/auto/i) is -1
-
       $element
       .popover(
-        placement: if shouldAddSmart then "auto #{step.placement}" else step.placement
+        placement: step.placement
         trigger: 'manual'
         title: step.title
         content: step.content

diff --git a/src/docs/api.html b/src/docs/api.html
@@ -15,7 +15,6 @@ <h3 id="tour-options">Global options</h3>
   name: "tour",
   steps: [],
   container: "body",
-  smartPlacement: true,
   keyboard: true,
   storage: window.localStorage,
   debug: false,
@@ -89,12 +88,6 @@ <h3 class='popover-title'></h3>
           </td>
           <td><code>'body'</code></td>
         </tr>
-        <tr>
-          <td>smartPlacement</td>
-          <td>Boolean</td>
-          <td>It dynamically reorients the popover by default by specifying auto for the placement, every time.<br></td>
-          <td><code>true</code></td>
-        </tr>
         <tr>
           <td>autoscroll</td>
           <td>Boolean</td>
@@ -338,7 +331,6 @@ <h3>Step Options</h3>
   host: "",
   element: "",
   placement: "right",
-  smartPlacement: true,
   title: "",
   content: "",
   next: 0,
@@ -410,12 +402,6 @@ <h3>Step Options</h3>
           </td>
           <td><code>'right'</code></td>
         </tr>
-        <tr>
-          <td>smartPlacement</td>
-          <td>Boolean</td>
-          <td>It dynamically reorients the popover by default by specifying auto for the placement.</td>
-          <td><code>true</code></td>
-        </tr>
         <tr>
           <td>title</td>
           <td>String|Function</td>

diff --git a/src/docs/assets/js/bootstrap-tour.js b/src/docs/assets/js/bootstrap-tour.js
@@ -545,7 +545,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
     };
 
     Tour.prototype._showPopover = function(step, i) {
-      var $element, $tip, isOrphan, options, shouldAddSmart;
+      var $element, $tip, isOrphan, options;
       $(".tour-" + this._options.name).remove();
       options = $.extend({}, this._options);
       isOrphan = this._isOrphan(step);
@@ -570,9 +570,8 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
           };
         })(this));
       }
-      shouldAddSmart = step.smartPlacement === true && step.placement.search(/auto/i) === -1;
       $element.popover({
-        placement: shouldAddSmart ? "auto " + step.placement : step.placement,
+        placement: step.placement,
         trigger: 'manual',
         title: step.title,
         content: step.content,

diff --git a/test/bootstrap-tour.js b/test/bootstrap-tour.js
@@ -545,7 +545,7 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
     };
 
     Tour.prototype._showPopover = function(step, i) {
-      var $element, $tip, isOrphan, options, shouldAddSmart;
+      var $element, $tip, isOrphan, options;
       $(".tour-" + this._options.name).remove();
       options = $.extend({}, this._options);
       isOrphan = this._isOrphan(step);
@@ -570,9 +570,8 @@ var bind = function(fn, me){ return function(){ return fn.apply(me, arguments);
           };
         })(this));
       }
-      shouldAddSmart = step.smartPlacement === true && step.placement.search(/auto/i) === -1;
       $element.popover({
-        placement: shouldAddSmart ? "auto " + step.placement : step.placement,
+        placement: step.placement,
         trigger: 'manual',
         title: step.title,
         content: step.content,