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

Remove jQuery requirement. Fix tests. #43

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove jQuery requirement. Fix tests. #43

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
66 changes: 37 additions & 29 deletions app/components/loading-slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { inject as service } from '@ember/service';
import Component from '@ember/component';
import { run } from '@ember/runloop';
import { isBlank } from '@ember/utils';
import $ from 'jquery';

export default Component.extend({
tagName: 'div',
Expand Down Expand Up @@ -63,7 +62,7 @@ export default Component.extend({
},

manage() {
if (isBlank(this.$())) {
if (isBlank(this.element)) {
return;
}

Expand All @@ -82,22 +81,25 @@ export default Component.extend({
this.set('isLoaded', false);
let self = this,
elapsedTime = 0,
inner = $(`<span class="loading-slider__progress ${this.get('progressBarClass')}">`),
outer = this.$(),
inner = document.createElement('span'),
outer = this.element,
duration = this.getWithDefault('duration', 300),
innerWidth = 0,
outerWidth = this.$().width(),
outerWidth = this.element.clientWidth,
stepWidth = Math.round(outerWidth / 50),
color = this.get('color');

inner.setAttribute('class', `loading-slider__progress ${this.get('progressBarClass')}`);
outer.appendChild(inner);

outer.append(inner);
if (color) {
inner.css('background-color', color);
inner.style.backgroundColor = color;
}

let interval = window.setInterval(function() {
elapsedTime = elapsedTime + 10;
inner.width(innerWidth = innerWidth + stepWidth);
inner.style.width = `${innerWidth}px`;
innerWidth = innerWidth + stepWidth;

// slow the animation if we used more than 75% the estimated duration
// or 66% of the animation width
Expand All @@ -109,8 +111,8 @@ export default Component.extend({
}

if (innerWidth > outerWidth) {
run.later(function() {
outer.empty();
run.later(this, function() {
self._removeNodes(outer);
window.clearInterval(interval);
}, 50);
}
Expand All @@ -129,7 +131,7 @@ export default Component.extend({

expandingAnimate() {
let self = this,
outer = this.$(),
outer = this.element,
speed = this.getWithDefault('speed', 1000),
colorQueue = this.get('color');

Expand All @@ -142,7 +144,7 @@ export default Component.extend({
colorQueue.push(color);
self.expandItem.call(self, color);
if ( ! self.get('isLoading')) {
outer.empty();
self._removeNodes(outer);
} else {
window.setTimeout(updateFn, speed);
}
Expand All @@ -153,51 +155,57 @@ export default Component.extend({
},

expandItem(color, cleanUp) {
let inner = $('<span>').css({'background-color': color}),
outer = this.$(),
let inner = document.createElement('span'),
outer = this.element,
innerWidth = 0,
outerWidth = outer.width(),
outerWidth = outer.clientWidth,
stepWidth = Math.round(outerWidth / 50);
let ua = window.navigator.userAgent;
let ie10 = ua.indexOf("MSIE "),
ie11 = ua.indexOf('Trident/'),
ieEdge = ua.indexOf('Edge/');
let self = this;

outer.append(inner);
inner.style.backgroundColor = color;
outer.appendChild(inner);

let interval = window.setInterval(function() {
let step = (innerWidth = innerWidth + stepWidth);
if (innerWidth > outerWidth) {
window.clearInterval(interval);
if (cleanUp) {
outer.empty();
self._removeNodes(outer);
}
}
if (ie10 > 0 || ie11 > 0 || ieEdge > 0) {
inner.css({
'margin': '0 auto',
'width': step
});
inner.style.margin = '0 auto';
inner.style.width = `${step}px`;
} else {
inner.css({
'margin-left': '-' + step / 2 + 'px',
'width': step
});
inner.style.marginLeft = `-${step / 2}px`;
inner.style.width = `${step}px`;
}
}, 10);
},

didInsertElement() {
this.$().html('<span>');

var color = this.get('color');
let innerSpan = document.createElement('span');
let color = this.get('color');
if (color) {
this.$('span').css('background-color', color);
innerSpan.style.backgroundColor = color;
}

this.element.appendChild(innerSpan);

if (this.get('runManageInitially')) {
this._startLoading();
}
},

_removeNodes(element) {
while (element.lastChild) {
element.removeChild(element.lastChild);
}
}
});

Expand Down
20 changes: 10 additions & 10 deletions tests/integration/main-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ module('Acceptance | Main', function(hooks) {
test('visiting /75', async function(assert) {
await visit('/75');

assert.equal(await findAll('.loading-slider').length, 1, "The component's element exists");
assert.equal(await findAll('.loading-slider span').length, 1, 'The component has inserted one span');
assert.equal(await find('.loading-slider span').clientWidth, 0, 'The stripe has finished animating and is width 0');
assert.equal(findAll('.loading-slider').length, 1, "The component's element exists");
assert.equal(findAll('.loading-slider span').length, 1, 'The component has inserted one span');
assert.equal(find('.loading-slider span').clientWidth, 0, 'The stripe has finished animating and is width 0');
});

test('testing animation', async function(assert) {
Expand All @@ -22,12 +22,12 @@ module('Acceptance | Main', function(hooks) {
// use the jQuery click rather than the promise observing click
await findAll('button')[1].click();

later(async () => {
assert.equal(await findAll('.loading-slider span')[1].clientWidth > 0, true, 'The slider has animated');
}, 500);
later(() => {
assert.equal(findAll('.loading-slider span')[1].clientWidth > 0, true, 'The slider has animated');
}, 250);

later(async () => {
assert.equal(await findAll('.loading-slider span').length === 0, true, 'The slider has reset');
later(() => {
assert.equal(findAll('.loading-slider span').length === 0, true, 'The slider has reset');
}, 1500);
});

Expand All @@ -37,8 +37,8 @@ module('Acceptance | Main', function(hooks) {
// use the jQuery click rather than the promise observing click
await findAll('button')[2].click();

later(async () => {
assert.equal(await findAll('.loading-slider span')[1].clientWidth > 0, true, 'The slider has animated');
later(() => {
assert.equal(findAll('.loading-slider span')[1].clientWidth > 0, true, 'The slider has animated');
}, 1000);

later(() => {
Expand Down