add additional checks to ensure that elements exist before any jQuery…

… logic
jakemmarsh · Mar 8, 2015 · bf2ad4b · bf2ad4b
1 parent 567041d
commit bf2ad4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dist/js/Mixin.js b/dist/js/Mixin.js
@@ -176,8 +176,8 @@ module.exports = function(settings, done) {
     renderCurrentStep: function() {
       var element = null;
       var currentStep = this.settings.steps[this.state.currentIndex];
-      var $target = $(currentStep.element);
-      var cssPosition = $target.css('position');
+      var $target = currentStep && currentStep.element ? $(currentStep.element) : null;
+      var cssPosition = $target ? $target.css('position') : null;
 
       if ( $target && $target.length ) {
         if ( this.state.showTooltip ) {

diff --git a/lib/js/Mixin.js b/lib/js/Mixin.js
@@ -176,8 +176,8 @@ module.exports = function(settings, done) {
     renderCurrentStep: function() {
       var element = null;
       var currentStep = this.settings.steps[this.state.currentIndex];
-      var $target = $(currentStep.element);
-      var cssPosition = $target.css('position');
+      var $target = currentStep && currentStep.element ? $(currentStep.element) : null;
+      var cssPosition = $target ? $target.css('position') : null;
 
       if ( $target && $target.length ) {
         if ( this.state.showTooltip ) {