Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update add-on to use Shepherd with Popper.js #221

Merged
merged 1 commit into from
Jul 2, 2018
Merged

Update add-on to use Shepherd with Popper.js #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .bowerrc
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions bower.json
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ module.exports = {
}
};
},
'tether-shepherd'() {
'shepherd.js'() {
return {
srcDir: 'dist',
import: {
include: [
'js/popper.js',
'js/shepherd.js',
this.theme
],
Expand Down
8 changes: 2 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@
"ember-cli-babel": "^6.6.0",
"ember-cli-node-assets": "0.2.2",
"ember-getowner-polyfill": "2.2.0",
"ember-tether": "1.0.0",
"fastboot-transform": "^0.1.3",
"tether-shepherd": "1.8.1"
"shepherd.js": "^2.0.0-beta.2"
},
"devDependencies": {
"@html-next/flexi-config": "^2.1.1",
Expand Down Expand Up @@ -100,10 +99,7 @@
},
"ember-addon": {
"configPath": "tests/dummy/config",
"demoURL": "http://ember-shepherd.shipshape.io/",
"after": [
"ember-tether"
]
"demoURL": "http://ember-shepherd.shipshape.io/"
},
"greenkeeper": {
"ignore": [
Expand Down
12 changes: 6 additions & 6 deletions tests/acceptance/ember-shepherd-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ module('Acceptance | Tour functionality tests', function(hooks) {
await click('.toggleHelpModal');

assert.ok(document.body.classList.contains('shepherd-active'), 'Body gets class of shepherd-active, when shepherd becomes active');
assert.equal(document.querySelectorAll('.shepherd-enabled').length, 2, 'attachTo element and tour have shepherd-enabled class');
assert.equal(document.querySelectorAll('.shepherd-enabled').length, 1, 'attachTo element has the shepherd-enabled class');
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can use the shepherd-open class

assert.ok(document.querySelector('#shepherdOverlay'), '#shepherdOverlay exists, since modal');
});

Expand All @@ -146,7 +146,7 @@ module('Acceptance | Tour functionality tests', function(hooks) {
await click('.toggleHelpNonmodal');

assert.ok(document.body.classList.contains('shepherd-active'), 'Body gets class of shepherd-active, when shepherd becomes active');
assert.equal(document.querySelectorAll('.shepherd-enabled').length, 2, 'attachTo element and tour get shepherd-enabled class');
assert.equal(document.querySelectorAll('.shepherd-enabled').length, 1, 'attachTo element has the shepherd-enabled class');
assert.notOk(document.querySelector('#shepherdOverlay'), '#shepherdOverlay should not exist, since non-modal');
});

Expand All @@ -158,15 +158,15 @@ module('Acceptance | Tour functionality tests', function(hooks) {
await click('.toggleHelpModal');
await click(document.querySelector('.shepherd-content .next-button'));

assert.ok(document.querySelector('.shepherd-enabled .back-button'), 'Ensure that the back button appears');
assert.ok(document.querySelector('.shepherd-open .back-button'), 'Ensure that the back button appears');

await click(document.querySelector('.shepherd-content .back-button'));

assert.notOk(document.querySelector('.shepherd-enabled .back-button'), 'Ensure that the back button disappears');
assert.notOk(document.querySelector('.shepherd-open .back-button'), 'Ensure that the back button disappears');

await click(document.querySelector('.shepherd-content .cancel-button'));

assert.notOk(document.querySelector('.shepherd-enabled [class^=shepherd-button]'), 'Ensure that all buttons are gone, after exit');
assert.notOk(document.querySelector('.shepherd-open [class^=shepherd-button]'), 'Ensure that all buttons are gone, after exit');
});

test('Highlight applied', async function(assert) {
Expand Down Expand Up @@ -539,7 +539,7 @@ module('Acceptance | Tour functionality tests', function(hooks) {

tour.show('usage');

assert.equal(document.querySelector('.shepherd-enabled.shepherd-open .shepherd-text').textContent,
assert.equal(document.querySelector('.shepherd-open .shepherd-text').textContent,
'To use the tour service, simply inject it into your application and use it like this example.',
'Usage step shown');
});
Expand Down
46 changes: 24 additions & 22 deletions tests/dummy/app/styles/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,28 +80,6 @@ a {

.shepherd-element {
&.shepherd-theme-arrows {
&.shepherd-element-attached-bottom {
&.shepherd-element-attached-center {
.shepherd-content:before {
border-top-color: $background1;
bottom: 100%;
left: 50%;
margin-left: -16px;
}
}
}

&.shepherd-element-attached-top {
&.shepherd-element-attached-center {
.shepherd-content:before {
border-bottom-color: $background1;
bottom: 100%;
left: 50%;
margin-left: -16px;
}
}
}

&.shepherd-has-title {
header {
background-color: $whiteish;
Expand All @@ -118,6 +96,26 @@ a {
}
}

&[x-placement^="bottom"] {
.popper__arrow {
border-bottom-color: $background1;
}

&.shepherd-has-title .popper__arrow {
border-bottom-color: $whiteish;
}
}

&[x-placement^="top"] {
.popper__arrow {
border-top-color: $background1;
}

&.shepherd-has-title .popper__arrow {
border-top-color: $whiteish;
}
}

.shepherd-content {
background-color: $background1;

Expand Down Expand Up @@ -146,6 +144,10 @@ a {
font-size: 0.75em;
line-height: 0.75em;
padding-top: 1em;

&.shepherd-button-secondary {
background-color: $whiteish;
}
}

h1,
Expand Down
36 changes: 14 additions & 22 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2826,11 +2826,11 @@ electron-to-chromium@^1.3.45:
version "1.3.45"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.45.tgz#458ac1b1c5c760ce8811a16d2bfbd97ec30bafb8"

ember-assign-polyfill@2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/ember-assign-polyfill/-/ember-assign-polyfill-2.2.0.tgz#7953836e5ccd4da05b2493423d3efc00df80ca74"
ember-assign-polyfill@2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/ember-assign-polyfill/-/ember-assign-polyfill-2.3.0.tgz#bc2478128490de40a6966157959649fc055cc3c4"
dependencies:
ember-cli-babel "^6.8.2"
ember-cli-babel "^6.6.0"
ember-cli-version-checker "^2.0.0"

ember-cli-babel@^5.1.5:
Expand Down Expand Up @@ -3359,14 +3359,6 @@ ember-template-lint@^0.8.16:
resolve "^1.1.3"
strip-bom "^3.0.0"

ember-tether@1.0.0-beta.3:
version "1.0.0-beta.3"
resolved "https://registry.yarnpkg.com/ember-tether/-/ember-tether-1.0.0-beta.3.tgz#444d846b62cba642e20b09ebb55305325a1d50c3"
dependencies:
ember-cli-babel "^6.6.0"
ember-cli-node-assets "^0.2.2"
tether "^1.4.0"

ember-try-config@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ember-try-config/-/ember-try-config-3.0.0.tgz#012d8c90cae9eb624e2b62040bf7e76a1aa58edc"
Expand Down Expand Up @@ -6917,6 +6909,10 @@ pluralize@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"

popper.js@^1.14.3:
version "1.14.3"
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095"

portfinder@^1.0.7:
version "1.0.13"
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
Expand Down Expand Up @@ -7991,6 +7987,12 @@ shellwords@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"

shepherd.js@^2.0.0-beta.2:
version "2.0.0-beta.2"
resolved "https://registry.yarnpkg.com/shepherd.js/-/shepherd.js-2.0.0-beta.2.tgz#91ad84a796f337585a8efca157cfaccb571b878a"
dependencies:
popper.js "^1.14.3"

signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
Expand Down Expand Up @@ -8780,16 +8782,6 @@ testem@^2.2.0:
tap-parser "^5.1.0"
xmldom "^0.1.19"

tether-shepherd@1.8.1:
version "1.8.1"
resolved "https://registry.yarnpkg.com/tether-shepherd/-/tether-shepherd-1.8.1.tgz#4fd9b2fdd9059f04b6c4249456d5ae145a3e9223"
dependencies:
tether "^1.0.1"

tether@^1.0.1, tether@^1.4.0:
version "1.4.3"
resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.3.tgz#fd547024c47b6e5c9b87e1880f997991a9a6ad54"

text-encoding@^0.6.4:
version "0.6.4"
resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
Expand Down