Merge pull request #10810 from asutherland/email-fix-folder-picker-bu…

…stage Bug 890560 - [email] message move broken by folder picker/value selector helper regression from bug 886446. a=bustage-fix
mozilla-b2g · Jul 5, 2013 · 80b4ec6 · 80b4ec6
2 parents 6d79318 + e570275
commit 80b4ec6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/apps/email/js/mail_common.js b/apps/email/js/mail_common.js
@@ -545,7 +545,7 @@ console.log('pushCard for type: ' + type);
       }
 
         var folderCardObj =
-          Cards.findCardObject(['folder-picker', 'navigation']);
+          Cards.findCardObject(['folder_picker', 'navigation']);
         var folderImpl = folderCardObj.cardImpl;
         var folders = folderImpl.foldersSlice.items;
         for (var i = 0; i < folders.length; i++) {

diff --git a/apps/email/style/mail.css b/apps/email/style/mail.css
@@ -14,6 +14,7 @@
 @import url('marquee.css');
 @import url('message_cards.css');
 @import url('setup_cards.css');
+@import url('value_selector.css');
 
 
 .peep-bubble {