FIX: pinned picker in IE11

danskdynamit · Mar 31, 2016 · bd1ca35 · bd1ca35
1 parent 5d641d0
commit bd1ca35
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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()));
     });
   },