refactored force not skip

benmarch · benmarch · commit 213a33d5296f · 2015-03-04T16:14:37.000-05:00
diff --git a/app/tour_step_directive.js b/app/tour_step_directive.js
@@ -39,14 +39,10 @@
                     function stepIsSkipped() {
                         var skipped;
                         if (attrs[TourHelpers.getAttrName('skip')]) {
-                            //force not skipped
-                            if (attrs[TourHelpers.getAttrName('skip')] === 'false') {
-                                return false;
-                            }
                             skipped = scope.$eval(attrs[TourHelpers.getAttrName('skip')]);
                         }
                         if (!skipped) {
-                            skipped = !!step.path || element.is(':hidden');
+                            skipped = !!step.path || (element.is(':hidden') && !attrs.availableWhenHidden);
                         }
                         return skipped;
                     }
diff --git a/dist/angular-bootstrap-tour.js b/dist/angular-bootstrap-tour.js
@@ -439,14 +439,10 @@
                     function stepIsSkipped() {
                         var skipped;
                         if (attrs[TourHelpers.getAttrName('skip')]) {
-                            //force not skipped
-                            if (attrs[TourHelpers.getAttrName('skip')] === 'false') {
-                                return false;
-                            }
                             skipped = scope.$eval(attrs[TourHelpers.getAttrName('skip')]);
                         }
                         if (!skipped) {
-                            skipped = !!step.path || element.is(':hidden');
+                            skipped = !!step.path || (element.is(':hidden') && !attrs.availableWhenHidden);
                         }
                         return skipped;
                     }
diff --git a/dist/angular-bootstrap-tour.min.js b/dist/angular-bootstrap-tour.min.js

Original file line number	Diff line number	Diff line change
`@@ -39,14 +39,10 @@`
`39`	`39`	`function stepIsSkipped() {`
`40`	`40`	`var skipped;`
`41`	`41`	`if (attrs[TourHelpers.getAttrName('skip')]) {`
`42`		`- //force not skipped`
`43`		`- if (attrs[TourHelpers.getAttrName('skip')] === 'false') {`
`44`		`- return false;`
`45`		`- }`
`46`	`42`	`skipped = scope.$eval(attrs[TourHelpers.getAttrName('skip')]);`
`47`	`43`	`}`
`48`	`44`	`if (!skipped) {`
`49`		`- skipped = !!step.path \|\| element.is(':hidden');`
	`45`	`+ skipped = !!step.path \|\| (element.is(':hidden') && !attrs.availableWhenHidden);`
`50`	`46`	`}`
`51`	`47`	`return skipped;`
`52`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -439,14 +439,10 @@`
`439`	`439`	`function stepIsSkipped() {`
`440`	`440`	`var skipped;`
`441`	`441`	`if (attrs[TourHelpers.getAttrName('skip')]) {`
`442`		`- //force not skipped`
`443`		`- if (attrs[TourHelpers.getAttrName('skip')] === 'false') {`
`444`		`- return false;`
`445`		`- }`
`446`	`442`	`skipped = scope.$eval(attrs[TourHelpers.getAttrName('skip')]);`
`447`	`443`	`}`
`448`	`444`	`if (!skipped) {`
`449`		`- skipped = !!step.path \|\| element.is(':hidden');`
	`445`	`+ skipped = !!step.path \|\| (element.is(':hidden') && !attrs.availableWhenHidden);`
`450`	`446`	`}`
`451`	`447`	`return skipped;`
`452`	`448`	`}`