simplify error messaging for install failures (bug 790492)

Author: potch

hearth/media/js/buttons.js

@@ -59,61 +59,7 @@ define('buttons', ['browser', 'format', 'l10n', 'z'], function(browser, format,
         z.apps[product.manifest_url] = z.state.mozApps[product.manifest_url] = installer;
         setButton($button, gettext('Launch'), 'launch install');
     }).on('app_purchase_error app_install_error', function(e, installer, product, msg) {
-        var $button = getButton(product),
-            errSummary;
-
-        console.error('Error code:', msg);
-
-        switch (msg) {
-            // mozApps error codes, defined in
-            // https://developer.mozilla.org/en-US/docs/Apps/Apps_JavaScript_API/Error_object
-            case 'MKT_CANCELLED':
-            case 'DENIED':
-                msg = 'cancelled';
-                break;
-            case 'MANIFEST_URL_ERROR':
-                errSummary = gettext('The manifest could not be found at the given location.');
-                break;
-            case 'NETWORK_ERROR':
-                errSummary = gettext('App host could not be reached.');
-                break;
-            case 'MANIFEST_PARSE_ERROR':
-                errSummary = gettext('App manifest is unparsable.');
-                break;
-            case 'INVALID_MANIFEST':
-                errSummary = gettext('App manifest is invalid.');
-                break;
-            // Marketplace specific error codes.
-            case 'MKT_SERVER_ERROR':
-                errSummary = gettext('Internal server error.');
-                break;
-            case 'MKT_INSTALL_ERROR':
-                errSummary = gettext('Internal server error on app installation.');
-                break;
-            default:
-                errSummary = gettext('Install failed. Please try again later.');
-                break;
-        }
-
-        if (msg && msg != 'cancelled') {
-            var $btnContainer = $('.app-install');
-            setButton($button, gettext('Error'), 'error');
-
-            if ($btnContainer.length) { // Reviewers page.
-                var $errList = $('<ul class="errorlist"></ul>');
-                $errList.append(format.format('<li>{0}</li>', errSummary));
-                $btnContainer.find('.errorlist').remove();
-                $btnContainer.append($errList);
-            } else {
-                $button.trigger('notify', {
-                    title: gettext('Error'),
-                    msg: errSummary
-                });
-            }
-        } else {
-            // Cancelled install. Roll back.
-            revertButton($button);
-        }
+        revertButton($('button.installing'));
     }).on('buttons.overlay_dismissed', function() {
         // Dismissed error. Roll back.
         revertButton($('.button.error'));

hearth/media/js/install.js

@@ -1,8 +1,8 @@
 // Hey there! I know how to install apps. Buttons are dumb now.
 
 define(
-    ['apps', 'capabilities', 'payments/payments', 'requests', 'user', 'z'],
-    function(apps, caps, payments, requests, user, z) {
+    ['apps', 'capabilities', 'notification', 'payments/payments', 'requests', 'user', 'z'],
+    function(apps, caps, notification, payments, requests, user, z) {
     'use strict';
 
     function launchHandler(e) {
@@ -93,6 +93,26 @@ define(
     }
 
     function installError(installer, product, msg) {
+        console.log('error: ' +  msg);
+
+        switch (msg) {
+            // mozApps error codes, defined in
+            // https://developer.mozilla.org/en-US/docs/Apps/Apps_JavaScript_API/Error_object
+            case 'MKT_CANCELLED':
+            case 'DENIED':
+            case 'MANIFEST_URL_ERROR':
+            case 'NETWORK_ERROR':
+            case 'MANIFEST_PARSE_ERROR':
+            case 'INVALID_MANIFEST':
+                break;
+            // Marketplace specific error codes.
+            default:
+                notification.notification({
+                    message: gettext('Install failed. Please try again later.')
+                });
+                break;
+        }
+
         z.win.trigger('app_install_error', [installer, product, msg]);
     }