Merge pull request #11181 from crdlc/bug-hide-status-from-import-cenc…

…eled Bug 898287 - [Cancel Import] Don't show the status UI component after canceling
mozilla-b2g · Jul 26, 2013 · b67a4e7 · b67a4e7
2 parents a3d7268 + 4e3a598
commit b67a4e7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/apps/communications/contacts/js/contacts_settings.js b/apps/communications/contacts/js/contacts_settings.js
@@ -412,9 +412,11 @@ contacts.Settings = (function() {
         Contacts.navigation.home();
         if (importedContacts !== 0) {
           window.importUtils.setTimestamp('sim');
-          Contacts.showStatus(_('simContacts-imported3', {
-            n: importedContacts
-          }));
+          if (!cancelled) {
+            Contacts.showStatus(_('simContacts-imported3', {
+              n: importedContacts
+            }));
+          }
         }
       }, DELAY_FEEDBACK);
 
@@ -505,9 +507,11 @@ contacts.Settings = (function() {
           window.importUtils.setTimestamp('sd');
           resetWait(wakeLock);
           Contacts.navigation.home();
-          Contacts.showStatus(_('memoryCardContacts-imported3', {
-            n: importedContacts
-          }));
+          if (!cancelled) {
+            Contacts.showStatus(_('memoryCardContacts-imported3', {
+              n: importedContacts
+            }));
+          }
         }, DELAY_FEEDBACK);
       });
     }

diff --git a/apps/communications/contacts/js/importer_ui.js b/apps/communications/contacts/js/importer_ui.js
@@ -695,7 +695,7 @@ if (typeof window.importer === 'undefined') {
         parent.postMessage({
           type: 'window_close',
           data: '',
-          message: _('friendsUpdated', {
+          message: cancelled ? '' : _('friendsUpdated', {
             numFriends: numFriends
           })
         }, targetApp);

diff --git a/apps/communications/ftu/js/memcard_manager.js b/apps/communications/ftu/js/memcard_manager.js
@@ -83,8 +83,10 @@ var SdManager = {
 
           UIManager.navBar.removeAttribute('aria-disabled');
           utils.overlay.hide();
-          utils.status.show(
-            _('memoryCardContacts-imported3', {n: importedContacts}));
+          if (!cancelled) {
+            utils.status.show(
+              _('memoryCardContacts-imported3', {n: importedContacts}));
+          }
 
         }, DELAY_FEEDBACK);
       });

diff --git a/apps/communications/ftu/js/sim_manager.js b/apps/communications/ftu/js/sim_manager.js
@@ -412,7 +412,10 @@ var SimManager = {
         if (importedContacts !== 0) {
           window.importUtils.setTimestamp('sim');
           SimManager.alreadyImported = true;
-          utils.status.show(_('simContacts-imported3', {n: importedContacts}));
+          if (!cancelled) {
+            utils.status.show(_('simContacts-imported3',
+                                {n: importedContacts}));
+          }
         }
       }, DELAY_FEEDBACK);