Skip to content

Commit 37354da

Browse files
author
Kai Schlamp
committed
Renamed fadeInTime to fadeTime.
1 parent 425b13e commit 37354da

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

tests/unit/ticker/ticker_defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var ticker_defaults = {
99
mouseOnTimeout: 8000,
1010
mouseOffTimeout: 4000,
1111
slidingTime: 800,
12-
fadeInTime: 1000,
12+
fadeTime: 1000,
1313
next: null
1414
};
1515

tests/unit/ticker/ticker_events.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test("beforeScroll", function() {
1212
$("#ticker").ticker({
1313
initialTimeout: 0,
1414
slidingTime: 0,
15-
fadeInTime: 0,
15+
fadeTime: 0,
1616
next: function(lastItem) { return '<li>TestItem</li>'; },
1717
beforeScroll: function(event, ui) {
1818
ok(true, 'before scrolling fires beforeScroll callback');
@@ -32,7 +32,7 @@ test("afterScroll", function() {
3232
$("#ticker").ticker({
3333
initialTimeout: 0,
3434
slidingTime: 0,
35-
fadeInTime: 10000,
35+
fadeTime: 10000,
3636
next: function(lastItem) { return '<li>TestItem</li>'; },
3737
afterScroll: function(event, ui) {
3838
ok(true, 'after scrolling fires afterScroll callback');
@@ -53,7 +53,7 @@ test("afterFade", function() {
5353
$("#ticker").ticker({
5454
initialTimeout: 0,
5555
slidingTime: 0,
56-
fadeInTime: 100,
56+
fadeTime: 100,
5757
next: function(lastItem) { return '<li>TestItem</li>'; },
5858
afterFade: function(event, ui) {
5959
ok(true, 'after fade fires afterFade callback');

tests/unit/ticker/ticker_methods.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ test("stop after scroll", function() {
6060
mouseOnTimeout: 100,
6161
mouseOffTimeout: 100,
6262
slidingTime: 0,
63-
fadeInTime: 0,
63+
fadeTime: 0,
6464
next: function(lastItem) {
6565
if (counter == 0) {
6666
ok(true, "ticker scrolled one time");
@@ -89,7 +89,7 @@ test("start", function() {
8989
mouseOnTimeout: 100,
9090
mouseOffTimeout: 100,
9191
slidingTime: 0,
92-
fadeInTime: 0,
92+
fadeTime: 0,
9393
next: function(lastItem) {
9494
if (started) {
9595
ok(true, "ticker scrolled after it was started");

tests/unit/ticker/ticker_options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ test('{next: function() {return "TestItem"}}', function() {
119119
$("#ticker").ticker({
120120
initialTimeout: 0,
121121
slidingTime: 0,
122-
fadeInTime: 0,
122+
fadeTime: 0,
123123
mouseOffTimeout: 10000,
124124
next: function(lastItem) {
125125
return "<li>TestItem</li>";

ui/jquery.ui.ticker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $.widget( "ui.ticker", {
2222
mouseOnTimeout: 8000,
2323
mouseOffTimeout: 4000,
2424
slidingTime: 800,
25-
fadeInTime: 1000,
25+
fadeTime: 1000,
2626
next: null
2727
},
2828

@@ -142,7 +142,7 @@ $.widget( "ui.ticker", {
142142
$( this )
143143
.fadeTo(0, 0)
144144
.css('visibility', 'visible')
145-
.fadeTo(options.fadeInTime, 1, function() {
145+
.fadeTo(options.fadeTime, 1, function() {
146146
self._trigger('afterFade');
147147
});
148148
});

0 commit comments

Comments
 (0)