From bd1ca35f8b91f94de74c827a1656bdfad3fbf015 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 1 Apr 2016 05:54:36 +1100 Subject: [PATCH] FIX: pinned picker in IE11 --- app/assets/javascripts/discourse/components/date-picker.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js.es6 index 621b0d1fd8..53b7c0c424 100644 --- a/app/assets/javascripts/discourse/components/date-picker.js.es6 +++ b/app/assets/javascripts/discourse/components/date-picker.js.es6 @@ -28,7 +28,7 @@ export default Em.Component.extend({ onSelect: date => this.set("value", moment(date).format("YYYY-MM-DD")) }; - this._picker = new Pikaday(Object.assign(default_opts, this._opts())); + this._picker = new Pikaday(_.merge(default_opts, this._opts())); }); },