From 1f23cbaf206692c39bc636a823b940dc2cf588f8 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 23 Jan 2015 15:22:58 +1030
Subject: [PATCH] Allow custom icon HTML in dropdown-button

Also rename title to label
---
 ember/app/components/ui/controls/dropdown-button.js       | 2 +-
 .../templates/components/ui/controls/dropdown-button.hbs  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ember/app/components/ui/controls/dropdown-button.js b/ember/app/components/ui/controls/dropdown-button.js
index e0748429e..6d29357c9 100644
--- a/ember/app/components/ui/controls/dropdown-button.js
+++ b/ember/app/components/ui/controls/dropdown-button.js
@@ -6,7 +6,7 @@ export default Ember.Component.extend({
     classNames: ['dropdown', 'btn-group'],
     classNameBindings: ['itemCountClass', 'class'],
 
-    title: 'Controls',
+    label: 'Controls',
     icon: 'ellipsis-v',
     buttonClass: 'btn btn-default',
     menuClass: '',
diff --git a/ember/app/templates/components/ui/controls/dropdown-button.hbs b/ember/app/templates/components/ui/controls/dropdown-button.hbs
index 015acda4f..2f37bfee9 100644
--- a/ember/app/templates/components/ui/controls/dropdown-button.hbs
+++ b/ember/app/templates/components/ui/controls/dropdown-button.hbs
@@ -1,6 +1,10 @@
 <a href="#" {{bind-attr class=":dropdown-toggle buttonClass"}} data-toggle="dropdown" {{action "buttonClick"}}>
-    {{fa-icon icon class="icon-glyph"}}
-	<span class="label">{{title}}</span>
+    {{#if iconHtml}}
+    	{{{iconHtml}}}
+    {{else}}
+    	{{fa-icon icon class="icon-glyph"}}
+    {{/if}}
+	<span class="label">{{label}}</span>
     {{fa-icon "caret-down" class="icon-caret"}}
 </a>
 {{ui/controls/item-list items=items class=dropdownMenuClass}}