Merge pull request #22977 from mancas/bug1053684

Bug 1053684 - [Clock] The Alarm sound volume is set at maximum r=mcav

apps/clock/js/audio_manager.js

@@ -35,6 +35,26 @@ define(function(require) {
     return Math.round(volume * SYSTEM_VOLUME_MAX);
   }
 
+  function requestAlarmSystemVolume() {
+    // Asynchronously load the alarm volume from mozSettings.
+    return new Promise(function(resolve, reject) {
+      var lock = navigator.mozSettings.createLock();
+      var req = lock.get(VOLUME_SETTING);
+      req.onsuccess = function() {
+        var volume = systemVolumeToFloat(req.result[VOLUME_SETTING]);
+        if (isValidVolume(volume)) {
+          globalVolumeManager._volume = volume;
+          resolve(volume);
+        }
+      };
+
+      req.onerror = function() {
+        var DEFAULT_VOLUME = 1.0;
+        resolve(DEFAULT_VOLUME);
+      };
+    });
+  }
+
   function VolumeManager() {
     this.VOLUME_KEY = 'defaultAlarmVolume';
     this.DEFAULT_VOLUME = 1.0;
@@ -44,16 +64,6 @@ define(function(require) {
       navigator.mozSettings.addObserver(
         VOLUME_SETTING,
         this.onSystemAlarmVolumeChange.bind(this));
-
-      // Asynchronously load the alarm volume from mozSettings.
-      var lock = navigator.mozSettings.createLock();
-      var req = lock.get(VOLUME_SETTING);
-      req.onsuccess = function() {
-        var volume = systemVolumeToFloat(req.result[VOLUME_SETTING]);
-        if (isValidVolume(volume)) {
-          this._volume = volume; // Do not use the setter here.
-        }
-      }.bind(this);
     }
   }
 
@@ -174,6 +184,9 @@ define(function(require) {
     getAlarmVolume: function() {
       return globalVolumeManager.volume;
     },
+    requestAlarmVolume: function() {
+      return requestAlarmSystemVolume();
+    },
     setAlarmVolume: function(volume, cb) {
       globalVolumeManager.setVolume(volume, cb);
     },

apps/clock/js/panels/alarm_edit/main.js

@@ -205,7 +205,10 @@ Utils.extend(AlarmEdit.prototype, {
     // to be "undefined" rather than "".
     this.element.dataset.id = this.alarm.id || '';
     this.inputs.name.value = this.alarm.label;
-    this.inputs.volume.value = AudioManager.getAlarmVolume();
+
+    AudioManager.requestAlarmVolume().then(function(volume) {
+      this.inputs.volume.value = AudioManager.getAlarmVolume();
+    }.bind(this));
 
     // Init time, repeat, sound, snooze selection menu.
     this.initTimeSelect();