From 043767adcd0e369f46da902973eb5cc0a9dae09c Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Tue, 4 Aug 2015 11:42:24 +0930
Subject: [PATCH] Sort out default dropdown caret icons

---
 framework/core/js/lib/components/Dropdown.js       | 2 +-
 framework/core/js/lib/components/SelectDropdown.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/framework/core/js/lib/components/Dropdown.js b/framework/core/js/lib/components/Dropdown.js
index c52691099..c17d96745 100644
--- a/framework/core/js/lib/components/Dropdown.js
+++ b/framework/core/js/lib/components/Dropdown.js
@@ -25,7 +25,7 @@ export default class Dropdown extends Component {
     props.buttonClassName = props.buttonClassName || '';
     props.contentClassName = props.contentClassName || '';
     props.label = props.label || app.trans('core.controls');
-    props.caretIcon = typeof props.caretIcon !== 'undefined' ? props.caretIcon : 'sort';
+    props.caretIcon = typeof props.caretIcon !== 'undefined' ? props.caretIcon : 'caret-down';
   }
 
   view() {
diff --git a/framework/core/js/lib/components/SelectDropdown.js b/framework/core/js/lib/components/SelectDropdown.js
index ec785c70b..5cc94de31 100644
--- a/framework/core/js/lib/components/SelectDropdown.js
+++ b/framework/core/js/lib/components/SelectDropdown.js
@@ -13,10 +13,11 @@ import icon from 'flarum/helpers/icon';
  */
 export default class SelectDropdown extends Dropdown {
   static initProps(props) {
+    props.caretIcon = typeof props.caretIcon !== 'undefined' ? props.caretIcon : 'sort';
+
     super.initProps(props);
 
     props.className += ' Dropdown--select';
-    props.caretIcon = props.caretIcon || 'sort';
   }
 
   getButtonContent() {