Skip to content

Commit

Permalink
Merge pull request #78 from PoslinskiNet/3.1-upgrade
Browse files Browse the repository at this point in the history
3.1 upgrade
  • Loading branch information
PoslinskiNet authored May 31, 2018
2 parents 2b1aefc + 228dac6 commit fbf01e6
Show file tree
Hide file tree
Showing 8 changed files with 2,878 additions and 3,663 deletions.
5 changes: 3 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@ module.exports = {
// node files
{
files: [
'ember-cli-build.js',
'index.js',
'testem.js',
'ember-cli-build.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
excludedFiles: [
'app/**',
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
],
parserOptions: {
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,9 @@ import './helpers/ember-introjs';

### Running tests

* `ember test`
* `ember test --server`
* `ember test` – Runs the test suite on the current Ember version
* `ember test --server` – Runs the test suite in "watch mode"
* `ember try:each` – Runs the test suite against multiple Ember versions

### Running the dummy application

Expand Down
5 changes: 5 additions & 0 deletions addon/components/intro-js.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ export default Component.extend({
intro.onafterchange(bind(this, this._onAfterChange));
intro.oncomplete(bind(this, this._onComplete));
intro.onexit(bind(this, this._onExit));
intro.onskip(bind(this, this._onSkip));
},

_setIntroJS(introJS){
Expand All @@ -167,6 +168,10 @@ export default Component.extend({
this.sendAction('on-exit', this.get('currentStep'), this);
},

_onSkip(){
this.sendAction('on-skip', this.get('currentStep'), this);
},

_onComplete() {
this.sendAction('on-complete', this.get('currentStep'));
},
Expand Down
Loading

0 comments on commit fbf01e6

Please sign in to comment.