Merge pull request #26914 from anrao91/1014219

Bug 1014219 - [Messages] Consider using real <button>s instead of <a> links for the header icons. r=azasypkin
mozilla-b2g · Dec 19, 2014 · 3a8e752 · 3a8e752
2 parents b7ce1db + 497d644
commit 3a8e752
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/apps/sms/index.html b/apps/sms/index.html
@@ -120,8 +120,8 @@
       <section id="thread-list" class="panel" role="region">
         <gaia-header class="view-header regular-header">
           <h1 data-l10n-id="messages">Messages</h1>
-          <a href="#composer" id="icon-add" data-icon="compose"></a>
-          <a id="threads-options-icon" data-icon="more"></a>
+          <a href="#composer" id="threads-composer-link" data-icon="compose"></a>
+          <a id="threads-options-button" data-icon="more"></a>
         </gaia-header>
         <article id="threads-container" class="view-body edit-container" data-type="list">
         </article>

diff --git a/apps/sms/js/thread_list_ui.js b/apps/sms/js/thread_list_ui.js
@@ -46,18 +46,17 @@ var ThreadListUI = {
     // TODO: https://bugzilla.mozilla.org/show_bug.cgi?id=854413
     [
       'container', 'no-messages',
-      'check-uncheck-all-button',
-      'delete-button', 'edit-header',
-      'options-icon', 'edit-mode', 'edit-form', 'draft-saved-banner'
+      'check-uncheck-all-button','composer-link',
+      'delete-button', 'edit-header','options-button',
+      'edit-mode', 'edit-form', 'draft-saved-banner'
     ].forEach(function(id) {
       this[Utils.camelCase(id)] = document.getElementById('threads-' + id);
     }, this);
 
     this.mainWrapper = document.getElementById('main-wrapper');
-    this.composerButton = document.getElementById('icon-add');
 
     // TODO this should probably move to a "WrapperView" class
-    this.composerButton.addEventListener(
+    this.composerLink.addEventListener(
       'click', this.launchComposer.bind(this)
     );
 
@@ -69,7 +68,7 @@ var ThreadListUI = {
       'action', this.cancelEdit.bind(this)
     );
 
-    this.optionsIcon.addEventListener(
+    this.optionsButton.addEventListener(
       'click', this.showOptions.bind(this)
     );
 

diff --git a/apps/sms/test/marionette/lib/messages.js b/apps/sms/test/marionette/lib/messages.js
@@ -41,7 +41,7 @@
 
     ThreadList: {
       firstThread: '.threadlist-item',
-      navigateToComposerHeaderButton: '#icon-add'
+      navigateToComposerHeaderButton: '#threads-composer-link'
     },
 
     Report: {

diff --git a/tests/python/gaia-ui-tests/gaiatest/apps/messages/app.py b/tests/python/gaia-ui-tests/gaiatest/apps/messages/app.py
@@ -13,10 +13,10 @@ class Messages(Base):
 
     name = 'Messages'
 
-    _create_new_message_locator = (By.ID, 'icon-add')
+    _create_new_message_locator = (By.ID, 'threads-composer-link')
     _first_message_locator = (By.ID, 'thread-1')
     _messages_frame_locator = (By.CSS_SELECTOR, 'iframe[data-url*=sms]')
-    _options_icon_locator = (By.ID, 'threads-options-icon')
+    _options_icon_locator = (By.ID, 'threads-options-button')
     _app_ready_locator = (By.CLASS_NAME, 'js-app-ready')
     _draft_message_locator = (By.CSS_SELECTOR, 'li.draft')
 

diff --git a/tests/python/gaia-ui-tests/gaiatest/tests/endurance/test_endurance_sms_conversation.py b/tests/python/gaia-ui-tests/gaiatest/tests/endurance/test_endurance_sms_conversation.py
@@ -14,7 +14,7 @@ class TestEnduranceSmsConversation(GaiaEnduranceTestCase):
 
     # summary page
     _summary_header_locator = ('xpath', "//h1[text()='Messages']")
-    _create_new_message_locator = ('id', 'icon-add')
+    _create_new_message_locator = ('id', 'threads-composer-link')
     _unread_message_locator = ('css selector', 'li > a.unread')
 
     # message composition