Skip to content

Commit

Permalink
update tests, fix a controls tabindex issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@ganlanyuan
ganlanyuan committed Nov 7, 2016
1 parent 4e1abd8 commit c86e397
Show file tree
Hide file tree
Showing 10 changed files with 413 additions and 200 deletions.
2 changes: 1 addition & 1 deletion dist/min/tiny-slider.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/min/tiny-slider.native.js
View file

Large diffs are not rendered by default.

41 changes: 29 additions & 12 deletions dist/tiny-slider.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1267,20 +1267,37 @@ var tns = (function () {
// set 'disabled' to true on controls when reach the edge
function updateControlsStatus() {
if (controls && !loop) {
if (index === indexMin || !rewind && index === indexMax) {
var inactive = (index === indexMin) ? prevButton : nextButton,
active = (index === indexMin) ? nextButton : prevButton;

changeFocus(inactive, active);
var disable = [], active = [];
if (index === indexMin) {
disable.push(prevButton);
active.push(nextButton);
changeFocus(prevButton, nextButton);
} else if (!rewind && index === indexMax) {
disable.push(nextButton);
active.push(prevButton);
changeFocus(nextButton, prevButton);
} else {
active.push(prevButton, nextButton);
}

inactive.disabled = true;
setAttrs(inactive, {'tabindex': '-1'});
if (disable.length > 0) {
for (var i = disable.length; i--;) {
var button = disable[i];
if (!button.disabled) {
button.disabled = true;
setAttrs(button, {'tabindex': '-1'});
}
}
}

active.disabled = false;
setAttrs(active, {'tabindex': '0'});
} else {
prevButton.disabled = false;
nextButton.disabled = false;
if (active.length > 0) {
for (var j = active.length; j--;) {
var button = active[j];
if (button.disabled) {
button.disabled = false;
setAttrs(button, {'tabindex': '0'});
}
}
}
}
}
Expand Down
41 changes: 29 additions & 12 deletions dist/tiny-slider.native.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -697,20 +697,37 @@ var tns = (function () {
// set 'disabled' to true on controls when reach the edge
function updateControlsStatus() {
if (controls && !loop) {
if (index === indexMin || !rewind && index === indexMax) {
var inactive = (index === indexMin) ? prevButton : nextButton,
active = (index === indexMin) ? nextButton : prevButton;

changeFocus(inactive, active);
var disable = [], active = [];
if (index === indexMin) {
disable.push(prevButton);
active.push(nextButton);
changeFocus(prevButton, nextButton);
} else if (!rewind && index === indexMax) {
disable.push(nextButton);
active.push(prevButton);
changeFocus(nextButton, prevButton);
} else {
active.push(prevButton, nextButton);
}

inactive.disabled = true;
setAttrs(inactive, {'tabindex': '-1'});
if (disable.length > 0) {
for (var i = disable.length; i--;) {
var button = disable[i];
if (!button.disabled) {
button.disabled = true;
setAttrs(button, {'tabindex': '-1'});
}
}
}

active.disabled = false;
setAttrs(active, {'tabindex': '0'});
} else {
prevButton.disabled = false;
nextButton.disabled = false;
if (active.length > 0) {
for (var j = active.length; j--;) {
var button = active[j];
if (button.disabled) {
button.disabled = false;
setAttrs(button, {'tabindex': '0'});
}
}
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ var inject = require('gulp-inject');
var browserSync = require('browser-sync').create();
var rename = require('gulp-rename');
var mergeStream = require('merge-stream');
var testcafe = require('gulp-testcafe');
// var testcafe = require('gulp-testcafe');

function errorlog (error) {
console.error.bind(error);
Expand Down Expand Up @@ -155,10 +155,10 @@ gulp.task('js', function () {
});

// testcafe
gulp.task('testcafe', () => {
return gulp.src(config.testcafe.src)
.pipe(testcafe(config.testcafe.options));
});
// gulp.task('testcafe', () => {
// return gulp.src(config.testcafe.src)
// .pipe(testcafe(config.testcafe.options));
// });

// browser-sync
gulp.task('sync', function() {
Expand Down
41 changes: 29 additions & 12 deletions src/tiny-slider.native.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -697,20 +697,37 @@ var tns = (function () {
// set 'disabled' to true on controls when reach the edge
function updateControlsStatus() {
if (controls && !loop) {
if (index === indexMin || !rewind && index === indexMax) {
var inactive = (index === indexMin) ? prevButton : nextButton,
active = (index === indexMin) ? nextButton : prevButton;

changeFocus(inactive, active);
var disable = [], active = [];
if (index === indexMin) {
disable.push(prevButton);
active.push(nextButton);
changeFocus(prevButton, nextButton);
} else if (!rewind && index === indexMax) {
disable.push(nextButton);
active.push(prevButton);
changeFocus(nextButton, prevButton);
} else {
active.push(prevButton, nextButton);
}

inactive.disabled = true;
setAttrs(inactive, {'tabindex': '-1'});
if (disable.length > 0) {
for (var i = disable.length; i--;) {
var button = disable[i];
if (!button.disabled) {
button.disabled = true;
setAttrs(button, {'tabindex': '-1'});
}
}
}

active.disabled = false;
setAttrs(active, {'tabindex': '0'});
} else {
prevButton.disabled = false;
nextButton.disabled = false;
if (active.length > 0) {
for (var j = active.length; j--;) {
var button = active[j];
if (button.disabled) {
button.disabled = false;
setAttrs(button, {'tabindex': '0'});
}
}
}
}
}
Expand Down
18 changes: 8 additions & 10 deletions tests/css/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,13 @@ button[aria-selected="true"] { background: #999; }
.vertical .img-8 { height: 164px; }
.vertical p { display: none; }

/*.fade .img-1 { height: 137px; }
.fade .img-2 { height: 122px; }
.fade .img-3 { height: 143px; }
.fade .img-4 { height: 325px; }
.fade .img-5 { height: 140px; }
.fade .img-6 { height: 119px; }
.fade .img-7 { height: 223px; }
.fade .img-8 { height: 164px; }*/
/*.animation .img-1 { height: 137px; }
.animation .img-2 { height: 122px; }
.animation .img-3 { height: 143px; }
.animation .img-4 { height: 325px; }
.animation .img-5 { height: 140px; }
.animation .img-6 { height: 119px; }
.animation .img-7 { height: 223px; }
.animation .img-8 { height: 164px; }*/

/*.vertical_wrapper,*/
/*.fade_wrapper */
.html_template { display: none; }
10 changes: 5 additions & 5 deletions tests/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@
<div class="html_template">
<h2>Title</h2>
<div>
<div>
<div class="item">
<div class="img img-1">1</div>
<p>Lorem ipsum dolor sit amet</p>
</div>
<div>
<div class="item">
<div class="img img-2">2</div>
<p>Blanditiis sapiente tempora </p>
</div>
<div>
<div class="item">
<div class="img img-3">3</div>
<p>At possimus dolorum eligendi repellat</p>
</div>
<div>
<div class="item">
<div class="img img-4">4</div>
<p>Cumque facilis amet eos nulla</p>
</div>
<div>
<div class="item">
<div class="img img-5">5</div>
<p>Sint ad, praesentium est delectus</p>
</div>
Expand Down
98 changes: 52 additions & 46 deletions tests/js/script.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,106 +20,112 @@ var tt = (function () {
ul = doc.createElement('ul'),
li = doc.createElement('li'),
speed = 100,
edgepadding = 50,
gutter = 10,
sliderSetting= {
'base': {
container: '',
items: 3,
speed: speed,
items: 3,
},
'gutter': {
container: '',
items: 3,
speed: speed,
gutter: 10,
items: 3,
gutter: gutter,
},
'edgePadding': {
container: '',
speed: speed,
items: 3,
edgePadding: edgepadding,
},
'edgePaddingGutter': {
container: '',
speed: speed,
gutter: 10,
edgePadding: 50,
items: 3,
gutter: gutter,
edgePadding: edgepadding,
},
'nonLoop': {
container: '',
speed: speed,
items: 3,
loop: false,
// rewind: true,
},
'slideByPage': {
'rewind': {
container: '',
speed: speed,
items: 3,
slideByPage: true,
rewind: true,
},
'slideByPage': {
container: '',
speed: speed,
items: 4,
slideBy: 'page',
},
'fixedWidth': {
container: '',
gutter: 10,
edgePadding: 50,
fixedWidth: 200,
// arrowKeys: true,
// rewind: true,
slideByPage: true,
loop: false,
speed: speed,
fixedWidth: 300,
},
'fixedWidthGutter': {
container: '',
speed: speed,
gutter: gutter,
fixedWidth: 300,
},
'fixedWidthEdgePadding': {
container: '',
speed: speed,
edgePadding: edgepadding,
fixedWidth: 300,
},
'fixedWidthEdgePaddingGutter': {
container: '',
speed: speed,
gutter: gutter,
edgePadding: edgepadding,
fixedWidth: 300,
},
'responsive': {
container: '',
gutter: 10,
gutterPosition: 'left',
edgePadding: 50,
slideBy: 'page',
speed: 600,
// arrowKeys: true,
speed: speed,
responsive: {
600: 2,
900: 3,
},
// rewind: true,
},
'arrowKeys': {
container: '',
speed: speed,
items: 3,
// edgePadding: 50,
// arrowKeys: true,
// slideByPage: true,
arrowKeys: true,
},
'autoplay': {
container: '',
speed: speed,
items: 3,
autoplay: true,
speed: 300,
autoplayTimeout: 3000,
autoplayText: ['▶', '❚❚'],
},
'vertical': {
container: '',
items: 2,
mode: 'carousel',
speed: speed,
items: 3,
axis: 'vertical',
// arrowKeys: true,
edgePadding: 50,
gutter: 10,
// slideBy: 'page',
// responsive: {
// 1280: 3,
// 1706: 4,
// }
},
'fade': {
'animation': {
container: '',
speed: speed * 10,
items: 3,
mode: 'gallery',
arrowKeys: true,
// edgePadding: 50,
speed: 1000,
gutter: 10,
animateIn: 'fadeInDown',
animateOut: 'fadeOutDown',
animateDelay: 300,
loop: false,
// slideBy: 'page',
// responsive: {
// 1280: 3,
// 1706: 4,
// }
}
};

Expand Down
Loading

0 comments on commit c86e397

Please sign in to comment.