Merge pull request #33154 from hkasemir/1223993-ringtone-notification…

…helper

Bug 1223993 - migrate ringtone app to NotificationHelper. r=squib, gandalf

apps/ringtones/js/share.js

@@ -1,4 +1,4 @@
-/* global CustomDialog, Notification */
+/* global CustomDialog, NotificationHelper */
 'use strict';
 
 screen.mozLockOrientation('portrait');
@@ -69,7 +69,6 @@ else {
 
 function handleShare(data, callback) {
   navigator.mozL10n.once(function() {
-    var _ = navigator.mozL10n.get;
 
     function showError(title, message, okCallback) {
       var okButton = {
@@ -95,7 +94,7 @@ function handleShare(data, callback) {
       songtitle = data.name;
     }
     else {
-      songtitle = _('ringtone-untitled');
+      songtitle = 'ringtone-untitled';
     }
 
     var subtitle = '';
@@ -228,13 +227,16 @@ function handleShare(data, callback) {
         // Show a notification indicating success, and then close it immediately
         // so it doesn't stink up the notifications tray! XXX: This UX isn't
         // great; we should turn this into a transient notification when we can.
-        new Notification(
+        NotificationHelper.send(
           songtitle,
-          {body: navigator.mozL10n.get(
-            details.setAsDefault ? 'set-default-tone' : 'created-tone'
-          )}
-        ).close();
-        callback('save', details);
+          { bodyL10n: details.setAsDefault ? 'set-default-tone' :
+                      'created-tone',
+            closeOnClick: false
+          }
+        ).then((notification) => {
+          notification.close();
+          callback('save', details);
+        });
       }, function(error) {
         console.log('Error saving ringtone', error);
         showError('save-error-title', 'save-error-desc',

apps/ringtones/share.html

@@ -13,6 +13,7 @@
     <meta name="availableLanguages" content="en-US">
     <link rel="localization" href="locales/ringtones.{locale}.properties">
     <script type="text/javascript" src="shared/js/l10n.js"></script>
+    <script type="text/javascript" src="shared/js/notification_helper.js"></script>
     <script type="text/javascript" defer src="shared/js/custom_dialog.js"></script>
 
     <!-- Web Components -->

build/l10n/xfail.list

@@ -54,7 +54,6 @@ apps/pdfjs/content/web/viewer.js
 apps/ringtones/js/built_in_ringtones.js
 apps/ringtones/js/null_ringtone.js
 apps/ringtones/js/sd_card_ringtones.js
-apps/ringtones/js/share.js
 apps/search/js/providers/marketplace.js
 apps/search/js/providers/places.js
 apps/sharedtest/test/unit/l10n/l10n_test.js