From a24bdabf084c2cea88c6de6d51d35e367da882d8 Mon Sep 17 00:00:00 2001 From: Timothy Mastny Date: Thu, 21 Jun 2018 16:17:42 -0500 Subject: [PATCH] Updates to Winston's feedback: removed for ... of iteration that is not supported in IE. --- NEWS.md | 2 +- srcjs/input_binding_slider.js | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/NEWS.md b/NEWS.md index 48032829e..29d141cee 100644 --- a/NEWS.md +++ b/NEWS.md @@ -9,7 +9,7 @@ shiny 1.1.0.9000 * Addressed [#2042](https://github.com/rstudio/shiny/issues/2042): dates outside of `min`/`max` date range are now a lighter shade of grey to highlight the allowed range. [#2087](https://github.com/rstudio/shiny/pull/2087) -* Addressed [#2019](https://github.com/rstudio/shiny/issues/2019): `updateInputSlider` now changes the slider formatting if the input type changes. +* Resolved [#2019](https://github.com/rstudio/shiny/issues/2019): `updateInputSlider` now changes the slider formatting if the input type changes.[#2099](https://github.com/rstudio/shiny/pull/2099) ### Documentation Updates diff --git a/srcjs/input_binding_slider.js b/srcjs/input_binding_slider.js index 73171e7a0..62dce6ce1 100644 --- a/srcjs/input_binding_slider.js +++ b/srcjs/input_binding_slider.js @@ -123,17 +123,22 @@ $.extend(sliderInputBinding, textInputBinding, { } } var sliderFeatures = ['min', 'max', 'step']; - for (var feats of sliderFeatures) { - if (data.hasOwnProperty(feats)) msg[feats] = data[feats]; + for (var i = 0; i < sliderFeatures.length; i++) { + var feats = sliderFeatures[i]; + if (data.hasOwnProperty(feats)) { + msg[feats] = data[feats]; + } } if (data.hasOwnProperty('label')) $el.parent().find('label[for="' + $escape(el.id) + '"]').text(data.label); var domElements = ['data-type', 'time-format', 'timezone']; - for (var elm of domElements) { - if (data.hasOwnProperty(elm)) - $el.data(elm, data[elm]); + for (var i = 0; i < domElements.length; i++) { + var elem = domElements[i]; + if (data.hasOwnProperty(elem)) { + $el.data(elem, data[elem]); + } } var dataType = $el.data('data-type');