FIX: pinned picker in IE11

2016-04-01 05:54:36 +11:00 · 2016-04-01 05:54:36 +11:00 · bd1ca35f8b
parent 5d641d0270
commit bd1ca35f8b
1 changed files with 1 additions and 1 deletions
--- 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()));
    });
  },