Skip to content

Commit eed869d

Browse files
authored
Make fileInput progress bar change color on error (rstudio#1673)
* Make fileInput progress bar change color on error. Fixes rstudio#1672 * Grunt * Update NEWS
1 parent f8f2acf commit eed869d

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

NEWS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ shiny 1.0.2.9000
1111

1212
### Bug fixes
1313

14+
* Fixed [#1672](https://github.com/rstudio/shiny/issues/1672): When an error occurred while uploading a file, the progress bar did not change colors. ([#1673](https://github.com/rstudio/shiny/pull/1673))
15+
1416
### Library updates
1517

1618

inst/www/shared/shiny.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

inst/www/shared/shiny.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

inst/www/shared/shiny.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

inst/www/shared/shiny.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

srcjs/input_binding_fileinput.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ $.extend(FileUploader.prototype, FileProcessor.prototype);
169169
this.$container().css('visibility', visible ? 'visible' : 'hidden');
170170
};
171171
this.$setError = function(error) {
172-
this.$bar().toggleClass('bar-danger', (error !== null));
172+
this.$bar().toggleClass('progress-bar-danger', (error !== null));
173173
if (error !== null) {
174174
this.onProgress(null, 1);
175175
this.$bar().text(error);

0 commit comments

Comments
 (0)