From db2e66b1c9885865cfa51b32c71140b9655c6510 Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 22 Dec 2014 17:04:43 -0500 Subject: [PATCH] Fixes #1330, indicating progress does not update correctly in webkit, adds data-percent value to module --- src/definitions/modules/progress.js | 3 ++ src/definitions/modules/progress.less | 68 +++++++++++++++------------ 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/src/definitions/modules/progress.js b/src/definitions/modules/progress.js index d49421ed2..72f0a7684 100644 --- a/src/definitions/modules/progress.js +++ b/src/definitions/modules/progress.js @@ -251,6 +251,9 @@ $.fn.progress = function(parameters) { $bar .css('width', value + '%') ; + $module + .attr('data-percent', parseInt(value, 10)) + ; } }, initials: function() { diff --git a/src/definitions/modules/progress.less b/src/definitions/modules/progress.less index 09ad5fbe7..53ccc5d0e 100755 --- a/src/definitions/modules/progress.less +++ b/src/definitions/modules/progress.less @@ -43,20 +43,10 @@ } /* Indicating */ -.ui.indicating.progress .bar[style^="width: 1%"], -.ui.indicating.progress .bar[style^="width: 2%"], -.ui.indicating.progress .bar[style^="width: 3%"], -.ui.indicating.progress .bar[style^="width: 4%"], -.ui.indicating.progress .bar[style^="width: 5%"], -.ui.indicating.progress .bar[style^="width: 6%"], -.ui.indicating.progress .bar[style^="width: 7%"], -.ui.indicating.progress .bar[style^="width: 8%"], -.ui.indicating.progress .bar[style^="width: 9%"], .ui.indicating.progress .bar[style^="width: 1"], .ui.indicating.progress .bar[style^="width: 2"] { background-color: @indicatingFirstColor; } - .ui.indicating.progress .bar[style^="width: 3"] { background-color: @indicatingSecondColor; } @@ -76,40 +66,56 @@ background-color: @indicatingSixthColor; } -/* Single Digits Last */ -.ui.indicating.progress .bar[style^="width: 1%"] + .label, -.ui.indicating.progress .bar[style^="width: 2%"] + .label, -.ui.indicating.progress .bar[style^="width: 3%"] + .label, -.ui.indicating.progress .bar[style^="width: 4%"] + .label, -.ui.indicating.progress .bar[style^="width: 5%"] + .label, -.ui.indicating.progress .bar[style^="width: 6%"] + .label, -.ui.indicating.progress .bar[style^="width: 7%"] + .label, -.ui.indicating.progress .bar[style^="width: 8%"] + .label, -.ui.indicating.progress .bar[style^="width: 9%"] + .label, -.ui.indicating.progress .bar[style^="width: 1"] + .label, -.ui.indicating.progress .bar[style^="width: 2"] + .label { +/* Indicating Label */ +.ui.indicating.progress[data-percent^="1"] .label, +.ui.indicating.progress[data-percent^="2"] .label { color: @indicatingFirstColor; } -.ui.indicating.progress .bar[style^="width: 3"] + .label { +.ui.indicating.progress[data-percent^="3"] .label { color: @indicatingSecondColor; } -.ui.indicating.progress .bar[style^="width: 4"] + .label, -.ui.indicating.progress .bar[style^="width: 5"] + .label { +.ui.indicating.progress[data-percent^="4"] .label, +.ui.indicating.progress[data-percent^="5"] .label { color: @indicatingThirdColor; } -.ui.indicating.progress .bar[style^="width: 6"] + .label { +.ui.indicating.progress[data-percent^="6"] .label { color: @indicatingFourthColor; } -.ui.indicating.progress .bar[style^="width: 7"] + .label, -.ui.indicating.progress .bar[style^="width: 8"] + .label { +.ui.indicating.progress[data-percent^="7"] .label, +.ui.indicating.progress[data-percent^="8"] .label { color: @indicatingFifthColor; } -.ui.indicating.progress .bar[style^="width: 9"] + .label, -.ui.indicating.progress .bar[style^="width: 100"] + .label { +.ui.indicating.progress[data-percent^="9"] .label, +.ui.indicating.progress[data-percent^="100"] .label { color: @indicatingSixthColor; } -.ui.indicating.progress.success .bar + .label { +/* Single Digits */ +.ui.indicating.progress .bar[style^="width: 1%"], +.ui.indicating.progress .bar[style^="width: 2%"], +.ui.indicating.progress .bar[style^="width: 3%"], +.ui.indicating.progress .bar[style^="width: 4%"], +.ui.indicating.progress .bar[style^="width: 5%"], +.ui.indicating.progress .bar[style^="width: 6%"], +.ui.indicating.progress .bar[style^="width: 7%"], +.ui.indicating.progress .bar[style^="width: 8%"], +.ui.indicating.progress .bar[style^="width: 9%"] { + background-color: @indicatingFirstColor; +} +.ui.indicating.progress[data-percent="1"] .label, +.ui.indicating.progress[data-percent="2"] .label, +.ui.indicating.progress[data-percent="3"] .label, +.ui.indicating.progress[data-percent="4"] .label, +.ui.indicating.progress[data-percent="5"] .label, +.ui.indicating.progress[data-percent="6"] .label, +.ui.indicating.progress[data-percent="7"] .label, +.ui.indicating.progress[data-percent="8"] .label, +.ui.indicating.progress[data-percent="9"] .label { + color: @indicatingFirstColor; +} + +/* Indicating Success */ +.ui.indicating.progress.success .label { color: @successHeaderColor; }