From eff3a89ae83e526f845d23c53acbb3c70cbee504 Mon Sep 17 00:00:00 2001 From: jlukic Date: Tue, 13 Jan 2015 13:55:49 -0500 Subject: [PATCH] Fixes #1611 Issue with incorrect conditional making percent appear as value for value progress --- RELEASE-NOTES.md | 1 + src/definitions/modules/progress.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 250dafd39..b2eb18ab7 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -28,6 +28,7 @@ - **Segment** - ``ui tabular menu`` now correctly aligns with attached segment when using fluid variation *Thanks @MohammadYounes* - **Steps** - Steps now use ``table-cell`` to allow steps to be equal height by default, even with different content height. - **Button** - Fix issue with labeled icon groups in material theme +- **Progress* - Fixes bug with progress that use ``total`` and ``value`` receiving the wrong values for text templates ### Version 1.6.4 - January 12, 2015 diff --git a/src/definitions/modules/progress.js b/src/definitions/modules/progress.js index fd4e25e86..fa170e24b 100644 --- a/src/definitions/modules/progress.js +++ b/src/definitions/modules/progress.js @@ -363,7 +363,7 @@ $.fn.progress = function(parameters) { if(module.total) { module.value = Math.round( (percent / 100) * module.total); } - if(settings.limitValues) { + else if(settings.limitValues) { module.value = (module.value > 100) ? 100 : (module.value < 0)