@@ -33,8 +33,19 @@ api.spinner.stop = function () {
33
33
}
34
34
35
35
if ( ! api . spinner . count ) {
36
- $ ( C_API_SELECTOR_SPINNER ) . fadeOut ( 'slow' ) ;
37
- api . spinner . progress . stop ( ) ;
36
+ if ( api . spinner . progress . instance ) {
37
+ // End the progress bar
38
+ api . spinner . progress . stop ( ) ;
39
+
40
+ // Close the spinner after 1 second to show 100% in the progress bar
41
+ setTimeout ( function ( ) {
42
+ $ ( C_API_SELECTOR_SPINNER ) . fadeOut ( 'slow' ) ;
43
+ } , 1000 ) ;
44
+ }
45
+ else {
46
+ // Close the spinner immediatelly
47
+ $ ( C_API_SELECTOR_SPINNER ) . fadeOut ( 'slow' ) ;
48
+ }
38
49
}
39
50
} ;
40
51
@@ -43,8 +54,17 @@ api.spinner.stop = function () {
43
54
*/
44
55
api . spinner . progress . start = function ( progressTimeout ) {
45
56
if ( progressTimeout ) {
46
- api . spinner . progress . stop ( ) ;
57
+ clearTimeout ( api . spinner . progress . instance ) ;
58
+
59
+ // Set progress timeout
47
60
api . spinner . progress . timeout = progressTimeout ;
61
+
62
+ // Set progress to 0%
63
+ $ ( C_API_SELECTOR_SPINNER + " .progress" ) . fadeOut ( 'slow' ) ;
64
+ $ ( C_API_SELECTOR_SPINNER + " .progress" ) . find ( "[name=bar]" ) . css ( 'width' , '0%' ) . attr ( 'aria-valuenow' , 0 ) ;
65
+ $ ( C_API_SELECTOR_SPINNER + " .progress" ) . find ( "[name=percentage]" ) . text ( "0%" ) ;
66
+
67
+ // Initiate the progress by setting the timeout
48
68
api . spinner . progress . setTimeout ( ) ;
49
69
}
50
70
} ;
@@ -54,9 +74,11 @@ api.spinner.progress.start = function (progressTimeout) {
54
74
*/
55
75
api . spinner . progress . stop = function ( ) {
56
76
clearTimeout ( api . spinner . progress . instance ) ;
77
+
78
+ // Set progress to 100%
57
79
$ ( C_API_SELECTOR_SPINNER + " .progress" ) . fadeOut ( 'slow' ) ;
58
- $ ( C_API_SELECTOR_SPINNER + " .progress" ) . find ( "[name=bar]" ) . css ( 'width' , '0 %' ) . attr ( 'aria-valuenow' , 0 ) ;
59
- $ ( C_API_SELECTOR_SPINNER + " .progress" ) . find ( "[name=percentage]" ) . text ( "0 %" ) ;
80
+ $ ( C_API_SELECTOR_SPINNER + " .progress" ) . find ( "[name=bar]" ) . css ( 'width' , '100 %' ) . attr ( 'aria-valuenow' , 100 ) ;
81
+ $ ( C_API_SELECTOR_SPINNER + " .progress" ) . find ( "[name=percentage]" ) . text ( "100 %" ) ;
60
82
} ;
61
83
62
84
/**
0 commit comments