github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-04-07 03:00:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make fileInput progress bar change color on error (#1673)

Browse Source 
* Make fileInput progress bar change color on error. Fixes #1672

* Grunt

* Update NEWS
This commit is contained in:
Winston Chang
2017-04-21 11:33:14 -05:00
committed by GitHub
parent f8f2acf6c3
commit eed869d321
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS.md
View File

@@ -11,6 +11,8 @@ shiny 1.0.2.9000
### Bug fixes
* 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))
### Library updates

2
inst/www/shared/shiny.js
View File

@@ -4979,7 +4979,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this.$container().css('visibility', visible ? 'visible' : 'hidden');
};
this.$setError = function (error) {
this.$bar().toggleClass('bar-danger', error !== null);
this.$bar().toggleClass('progress-bar-danger', error !== null);
if (error !== null) {
this.onProgress(null, 1);
this.$bar().text(error);

2
inst/www/shared/shiny.js.map
View File

File diff suppressed because one or more lines are too long

4
inst/www/shared/shiny.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
inst/www/shared/shiny.min.js.map
View File

File diff suppressed because one or more lines are too long

2
srcjs/input_binding_fileinput.js
View File

@@ -169,7 +169,7 @@ $.extend(FileUploader.prototype, FileProcessor.prototype);
this.$container().css('visibility', visible ? 'visible' : 'hidden');
};
this.$setError = function(error) {
this.$bar().toggleClass('bar-danger', (error !== null));
this.$bar().toggleClass('progress-bar-danger', (error !== null));
if (error !== null) {
this.onProgress(null, 1);
this.$bar().text(error);