Bug 1206701 - Fix the contact menu buttons on Loop's panel so that audio and video conversations can be selected properly. r=Mardak
authorMark Banner <standard8@mozilla.com>
Mon, 21 Sep 2015 18:11:21 +0100
changeset 263566 f9451efeca2f2fc6503f5a51c3a6057856d711ab
parent 263565 7c9f6250d9bad40141a4e2fa1df9b3fb636bf929
child 263567 865542cbbfe5b4e3383d16632a4a032d4d9ce006
push id29414
push usercbook@mozilla.com
push dateTue, 22 Sep 2015 10:19:39 +0000
treeherdermozilla-central@f4f27148d24c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMardak
bugs1206701
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1206701 - Fix the contact menu buttons on Loop's panel so that audio and video conversations can be selected properly. r=Mardak
browser/components/loop/content/js/contacts.js
browser/components/loop/content/js/contacts.jsx
--- a/browser/components/loop/content/js/contacts.js
+++ b/browser/components/loop/content/js/contacts.js
@@ -206,25 +206,23 @@ loop.contacts = (function(_, mozL10n) {
 
       return (
         React.createElement("ul", {className: dropdownClasses}, 
           React.createElement("li", {className: cx({ "dropdown-menu-item": true,
                               "disabled": this.props.blocked,
                               "video-call-item": true }), 
               "data-action": "video-call", 
               onClick: this.onItemClick}, 
-            React.createElement("i", {className: "icon icon-video-call"}), 
             mozL10n.get("video_call_menu_button")
           ), 
           React.createElement("li", {className: cx({ "dropdown-menu-item": true,
                               "disabled": this.props.blocked,
                               "audio-call-item": true }), 
               "data-action": "audio-call", 
               onClick: this.onItemClick}, 
-            React.createElement("i", {className: "icon icon-audio-call"}), 
             mozL10n.get("audio_call_menu_button")
           ), 
           React.createElement("li", {className: cx({ "dropdown-menu-item": true,
                               "disabled": !this.props.canEdit }), 
               "data-action": "edit", 
               onClick: this.onItemClick}, 
             mozL10n.get("edit_contact_title")
           ), 
--- a/browser/components/loop/content/js/contacts.jsx
+++ b/browser/components/loop/content/js/contacts.jsx
@@ -206,25 +206,23 @@ loop.contacts = (function(_, mozL10n) {
 
       return (
         <ul className={dropdownClasses}>
           <li className={cx({ "dropdown-menu-item": true,
                               "disabled": this.props.blocked,
                               "video-call-item": true })}
               data-action="video-call"
               onClick={this.onItemClick}>
-            <i className="icon icon-video-call" />
             {mozL10n.get("video_call_menu_button")}
           </li>
           <li className={cx({ "dropdown-menu-item": true,
                               "disabled": this.props.blocked,
                               "audio-call-item": true })}
               data-action="audio-call"
               onClick={this.onItemClick}>
-            <i className="icon icon-audio-call" />
             {mozL10n.get("audio_call_menu_button")}
           </li>
           <li className={cx({ "dropdown-menu-item": true,
                               "disabled": !this.props.canEdit })}
               data-action="edit"
               onClick={this.onItemClick}>
             {mozL10n.get("edit_contact_title")}
           </li>