Add curly braces to all blocks.

Google style guide requires adding curly braces to all block statements
even if it is only has one line.  This fixes it by using eslint's
--fix flag followed by running clang-format to reformat the change.

Change-Id: Idc086c2aa8c02df5ef8b2140a11bfb9128eeb4bd

Author: TheModMaker

.eslintrc.js

@@ -56,7 +56,6 @@ module.exports = {
         "camelcase": "off",
         "comma-dangle": "off",
         "comma-spacing": "off",
-        "curly": "off",
         "new-cap": "off",
         "no-multi-spaces": "off",
         "no-multiple-empty-lines": "off",

demo/asset_section.js

@@ -66,12 +66,15 @@ shakaDemo.setupAssets_ = function() {
     }
 
     let mimeTypes = [];
-    if (asset.features.indexOf(shakaAssets.Feature.WEBM) >= 0)
+    if (asset.features.indexOf(shakaAssets.Feature.WEBM) >= 0) {
       mimeTypes.push('video/webm');
-    if (asset.features.indexOf(shakaAssets.Feature.MP4) >= 0)
+    }
+    if (asset.features.indexOf(shakaAssets.Feature.MP4) >= 0) {
       mimeTypes.push('video/mp4');
-    if (asset.features.indexOf(shakaAssets.Feature.MP2TS) >= 0)
+    }
+    if (asset.features.indexOf(shakaAssets.Feature.MP2TS) >= 0) {
       mimeTypes.push('video/mp2t');
+    }
     if (!mimeTypes.some(
         function(type) { return shakaDemo.support_.media[type]; })) {
       option.disabled = true;
@@ -247,8 +250,9 @@ shakaDemo.preparePlayer_ = function(asset) {
   config.abr.enabled =
       document.getElementById('enableAdaptation').checked;
   let smallGapLimit = document.getElementById('smallGapLimit').value;
-  if (!isNaN(Number(smallGapLimit)) && smallGapLimit.length > 0)
+  if (!isNaN(Number(smallGapLimit)) && smallGapLimit.length > 0) {
     config.streaming.smallGapLimit = Number(smallGapLimit);
+  }
   config.streaming.jumpLargeGaps =
       document.getElementById('jumpLargeGaps').checked;
 

demo/common/controls.js

@@ -300,8 +300,9 @@ ShakaControls.prototype.onMouseMove_ = function(event) {
 
   // When there is a touch, we can get a 'mousemove' event after touch events.
   // This should be treated as part of the touch, which has already been handled
-  if (this.lastTouchEventTime_ && event.type == 'mousemove')
+  if (this.lastTouchEventTime_ && event.type == 'mousemove') {
     return;
+  }
 
   // Use the cursor specified in the CSS file.
   this.videoContainer_.style.cursor = '';

demo/common/demo_utils.js

@@ -29,12 +29,15 @@ ShakaDemoUtils.setupAssetMetadata = function(asset, player) {
       { drm: {}, manifest: { dash: {} } });
 
   // Add config from this asset.
-  if (asset.licenseServers)
+  if (asset.licenseServers) {
     config.drm.servers = asset.licenseServers;
-  if (asset.drmCallback)
+  }
+  if (asset.drmCallback) {
     config.manifest.dash.customScheme = asset.drmCallback;
-  if (asset.clearKeys)
+  }
+  if (asset.clearKeys) {
     config.drm.clearKeys = asset.clearKeys;
+  }
   player.configure(config);
 
   // Configure network filters.
@@ -48,13 +51,16 @@ ShakaDemoUtils.setupAssetMetadata = function(asset, player) {
     networkingEngine.registerRequestFilter(filter);
   }
 
-  if (asset.requestFilter)
+  if (asset.requestFilter) {
     networkingEngine.registerRequestFilter(asset.requestFilter);
-  if (asset.responseFilter)
+  }
+  if (asset.responseFilter) {
     networkingEngine.registerResponseFilter(asset.responseFilter);
-  if (asset.extraConfig)
-    player.configure(/** @type {shakaExtern.PlayerConfiguration} */(
-        asset.extraConfig));
+  }
+  if (asset.extraConfig) {
+    player.configure(
+        /** @type {shakaExtern.PlayerConfiguration} */ (asset.extraConfig));
+  }
 };
 
 

demo/info_section.js

@@ -121,18 +121,21 @@ shakaDemo.updateTrackOptions_ = function(list, tracks, languageAndRole) {
       let trackInfo = '';
       if (track.language) trackInfo += 'language: ' + track.language + ', ';
       if (track.label) trackInfo += 'label: ' + track.label + ', ';
-      if (track.roles.length)
+      if (track.roles.length) {
         trackInfo += 'roles: [' + track.roles.join() + '], ';
-      if (track.width && track.height)
+      }
+      if (track.width && track.height) {
         trackInfo += track.width + 'x' + track.height + ', ';
+      }
       trackInfo += track.bandwidth + ' bits/s';
       return trackInfo;
     } ,
     text: function(track) {
       let trackInfo = 'language: ' + track.language + ', ';
       if (track.label) trackInfo += 'label: ' + track.label + ', ';
-      if (track.roles.length)
+      if (track.roles.length) {
         trackInfo += 'roles: [' + track.roles.join() + '], ';
+      }
       trackInfo += 'kind: ' + track.kind;
       return trackInfo;
     }
@@ -239,8 +242,9 @@ shakaDemo.updateLanguageOptions_ =
     if (selectedTrack.language == language) {
       if (selectedTrack.roles.length) {
         selectedTrack.roles.forEach(function(selectedRole) {
-          if (selectedRole == role)
+          if (selectedRole == role) {
             isSelected = true;
+          }
         });
       } else {
         isSelected = true;

demo/main.js

@@ -433,8 +433,9 @@ shakaDemo.updateFromHash_ = function() {
 
 /** @private */
 shakaDemo.hashShouldChange_ = function() {
-  if (!shakaDemo.hashCanChange_)
+  if (!shakaDemo.hashCanChange_) {
     return;
+  }
 
   let params = [];
   let oldParams = shakaDemo.getParams_();
@@ -445,8 +446,9 @@ shakaDemo.hashShouldChange_ = function() {
   if (shakaDemo.player_) {
     assetUri = shakaDemo.player_.getManifestUri();
     let drmInfo = shakaDemo.player_.drmInfo();
-    if (drmInfo)
+    if (drmInfo) {
       licenseServerUri = drmInfo.licenseServerUri;
+    }
   }
   let assetList = document.getElementById('assetList');
   if (assetUri) {
@@ -499,8 +501,9 @@ shakaDemo.hashShouldChange_ = function() {
     params.push('smallGapLimit=' +
         document.getElementById('smallGapLimit').value);
   }
-  if (document.getElementById('jumpLargeGaps').checked)
+  if (document.getElementById('jumpLargeGaps').checked) {
     params.push('jumpLargeGaps');
+  }
   let audioLang = document.getElementById('preferredAudioLanguage').value;
   let textLang = document.getElementById('preferredTextLanguage').value;
   if (textLang != audioLang) {
@@ -540,12 +543,14 @@ shakaDemo.hashShouldChange_ = function() {
   // Store values for drm configuration.
   let videoRobustness =
       document.getElementById('drmSettingsVideoRobustness').value;
-  if (videoRobustness)
+  if (videoRobustness) {
     params.push('videoRobustness=' + videoRobustness);
+  }
   let audioRobustness =
       document.getElementById('drmSettingsAudioRobustness').value;
-  if (audioRobustness)
+  if (audioRobustness) {
     params.push('audioRobustness=' + audioRobustness);
+  }
 
   // These parameters must be added manually, so preserve them.
   // These are only used by the loader in load.js to decide which version of

demo/offline_section.js

@@ -65,15 +65,16 @@ shakaDemo.updateButtons_ = function(canHide) {
   button.disabled = (inProgress || !supportsDrm || option.isStored);
   button.innerText = storedContent ? 'Delete' : 'Store';
   let helpText = document.getElementById('storeDeleteHelpText');
-  if (inProgress)
+  if (inProgress) {
     helpText.textContent = 'Operation is in progress...';
-  else if (!supportsDrm)
+  } else if (!supportsDrm) {
     helpText.textContent = 'This browser does not support persistent licenses.';
-  else if (button.disabled)
+  } else if (button.disabled) {
     helpText.textContent = 'The asset is stored offline. ' +
         'Checkout the "Offline" section in the "Asset" list';
-  else
+  } else {
     helpText.textContent = '';
+  }
 };
 
 
@@ -187,8 +188,9 @@ shakaDemo.storeDeleteAsset_ = function() {
     p = storage.remove(offlineUri).then(function() {
       for (let i = 0; i < assetList.options.length; i++) {
         let option = assetList.options[i];
-        if (option.asset && option.asset.manifestUri == originalManifestUri)
+        if (option.asset && option.asset.manifestUri == originalManifestUri) {
           option.isStored = false;
+        }
       }
       return shakaDemo.refreshAssetList_();
     });
@@ -198,8 +200,9 @@ shakaDemo.storeDeleteAsset_ = function() {
     let assetName = asset.name ? '[OFFLINE] ' + asset.name : null;
     let metadata = {name: assetName || nameField || asset.manifestUri};
     p = storage.store(asset.manifestUri, metadata).then(function() {
-      if (option.asset)
+      if (option.asset) {
         option.isStored = true;
+      }
       return shakaDemo.refreshAssetList_().then(function() {
         // Auto-select offline copy of asset after storing.
         let group = shakaDemo.offlineOptGroup_;

lib/abr/simple_abr_manager.js

@@ -141,8 +141,9 @@ shaka.abr.SimpleAbrManager.prototype.chooseVariant = function() {
                  (minBandwidth / 1e6).toFixed(3),
                  (maxBandwidth / 1e6).toFixed(3));
 
-    if (currentBandwidth >= minBandwidth && currentBandwidth <= maxBandwidth)
+    if (currentBandwidth >= minBandwidth && currentBandwidth <= maxBandwidth) {
       chosen = variant;
+    }
   }
 
   this.lastTimeChosenMs_ = Date.now();
@@ -182,8 +183,9 @@ shaka.abr.SimpleAbrManager.prototype.segmentDownloaded = function(
   goog.asserts.assert(deltaTimeMs >= 0, 'expected a non-negative duration');
   this.bandwidthEstimator_.sample(deltaTimeMs, numBytes);
 
-  if ((this.lastTimeChosenMs_ != null) && this.enabled_)
+  if ((this.lastTimeChosenMs_ != null) && this.enabled_) {
     this.suggestStreams_();
+  }
 };
 
 

lib/cast/cast_receiver.js

@@ -267,8 +267,9 @@ shaka.cast.CastReceiver.prototype.onCastStatusChanged_ = function() {
     let event = new shaka.util.FakeEvent('caststatuschanged');
     this.dispatchEvent(event);
     // Send a media status message, with a media info message if appropriate.
-    if (!this.maybeSendMediaInfoMessage_())
+    if (!this.maybeSendMediaInfoMessage_()) {
       this.sendMediaStatus_(0);
+    }
   }.bind(this));
 };
 
@@ -385,14 +386,16 @@ shaka.cast.CastReceiver.prototype.pollAttributes_ = function() {
     for (let name in shaka.cast.CastUtils.PlayerGetterMethodsThatRequireLive) {
       let frequency =
           shaka.cast.CastUtils.PlayerGetterMethodsThatRequireLive[name];
-      if (this.updateNumber_ % frequency == 0)
-        update['player'][name] = /** @type {Object} */(this.player_)[name]();
+      if (this.updateNumber_ % frequency == 0) {
+        update['player'][name] = /** @type {Object} */ (this.player_)[name]();
+      }
     }
   }
   for (let name in shaka.cast.CastUtils.PlayerGetterMethods) {
     let frequency = shaka.cast.CastUtils.PlayerGetterMethods[name];
-    if (this.updateNumber_ % frequency == 0)
-      update['player'][name] = /** @type {Object} */(this.player_)[name]();
+    if (this.updateNumber_ % frequency == 0) {
+      update['player'][name] = /** @type {Object} */ (this.player_)[name]();
+    }
   }
 
   // Volume attributes are tied to the system volume.
@@ -406,8 +409,9 @@ shaka.cast.CastReceiver.prototype.pollAttributes_ = function() {
   // Only start progressing the update number once data is loaded,
   // just in case any of the "rarely changing" properties with less frequent
   // update messages changes significantly during the loading process.
-  if (this.startUpdatingUpdateNumber_)
+  if (this.startUpdatingUpdateNumber_) {
     this.updateNumber_ += 1;
+  }
 
   this.sendMessage_({
     'type': 'update',
@@ -598,8 +602,9 @@ shaka.cast.CastReceiver.prototype.onGenericMessage_ = function(event) {
     case 'SEEK': {
       let currentTime = message['currentTime'];
       let resumeState = message['resumeState'];
-      if (currentTime != null)
+      if (currentTime != null) {
         this.video_.currentTime = Number(currentTime);
+      }
       if (resumeState && resumeState == 'PLAYBACK_START') {
         this.video_.play();
         this.sendMediaStatus_(0);
@@ -628,10 +633,12 @@ shaka.cast.CastReceiver.prototype.onGenericMessage_ = function(event) {
       let muted = volumeObject['muted'];
       let oldVolumeLevel = this.video_.volume;
       let oldVolumeMuted = this.video_.muted;
-      if (level != null)
+      if (level != null) {
         this.video_.volume = Number(level);
-      if (muted != null)
+      }
+      if (muted != null) {
         this.video_.muted = muted;
+      }
       // Notify generic controllers if the volume changed.
       if (oldVolumeLevel != this.video_.volume ||
           oldVolumeMuted != this.video_.muted) {
@@ -650,8 +657,9 @@ shaka.cast.CastReceiver.prototype.onGenericMessage_ = function(event) {
       let currentTime = message['currentTime'];
       let manifestUri = this.opt_contentIdCallback_(contentId);
       let autoplay = message['autoplay'] || true;
-      if (autoplay)
+      if (autoplay) {
         this.video_.autoplay = true;
+      }
       this.player_.load(manifestUri, currentTime).then(function() {
         // Notify generic controllers that the media has changed.
         this.sendMediaInfoMessage_();
@@ -730,14 +738,15 @@ shaka.cast.CastReceiver.prototype.sendMessage_ =
  */
 shaka.cast.CastReceiver.prototype.getPlayState_ = function() {
   let playState = shaka.cast.CastReceiver.PLAY_STATE;
-  if (this.isIdle_)
+  if (this.isIdle_) {
     return playState.IDLE;
-  else if (this.player_.isBuffering())
+  } else if (this.player_.isBuffering()) {
     return playState.BUFFERING;
-  else if (this.video_.paused)
+  } else if (this.video_.paused) {
     return playState.PAUSED;
-  else
+  } else {
     return playState.PLAYING;
+  }
 };
 
 
@@ -774,8 +783,9 @@ shaka.cast.CastReceiver.prototype.sendMediaStatus_ =
     }
   };
 
-  if (opt_media)
+  if (opt_media) {
     mediaStatus['media'] = opt_media;
+  }
 
   let ret = {
     'requestId': requestId,

lib/cast/cast_sender.js

@@ -334,8 +334,9 @@ shaka.cast.CastSender.prototype.get = function(targetName, property) {
           property + ' should be called on a live stream!');
       // If the property shouldn't exist, return a fake function so that the
       // user doesn't call an undefined function and get a second error.
-      if (!isLive)
-        return function() { return undefined; };
+      if (!isLive) {
+        return () => undefined;
+      }
     }
     if (CastUtils.PlayerVoidMethods.indexOf(property) >= 0) {
       return this.remoteCall_.bind(this, targetName, property);