JS: Use the function argument default values where appropriate

Previously, we we simulating this using optional arguments and applying
default values within the function body. ES6 provides this more natural and
concise syntax for the same.

js/app/controllers/maincontroller.js

@@ -263,7 +263,7 @@ function ($rootScope, $scope, $timeout, $window, $document, ArtistFactory,
 		});
 	}
 
-	$scope.startScanning = function(fileIds /*optional*/) {
+	$scope.startScanning = function(fileIds = null) {
 		if (fileIds) {
 			filesToScan = fileIds;
 			previouslyScannedCount = 0;
@@ -356,14 +356,11 @@ function ($rootScope, $scope, $timeout, $window, $document, ArtistFactory,
 		return offset;
 	}
 
-	$scope.scrollToItem = function(itemId, animationTime /* optional */) {
+	$scope.scrollToItem = function(itemId, animationTime = 500) {
 		if (itemId) {
 			let container = OCA.Music.Utils.getScrollContainer();
 			let element = $('#' + itemId);
 			if (container && element) {
-				if (animationTime === undefined) {
-					animationTime = 500;
-				}
 				container.scrollToElement(element, scrollOffset(), animationTime);
 			}
 		}
@@ -376,12 +373,12 @@ function ($rootScope, $scope, $timeout, $window, $document, ArtistFactory,
 	// Navigate to a view selected from the navigation bar
 	let navigationDestination = null;
 	let afterNavigationCallback = null;
-	$scope.navigateTo = function(destination, callback /*optional*/) {
+	$scope.navigateTo = function(destination, callback = null) {
 		let curView = $rootScope.currentView;
 		if (curView != destination) {
 			$rootScope.currentView = null;
 			navigationDestination = destination;
-			afterNavigationCallback = callback || null;
+			afterNavigationCallback = callback;
 			$rootScope.loading = true;
 			// Deactivate the current view. The view emits 'viewDeactivated' once that is done.
 			// In the abnormal special case of no active view, activate the new view immediately.
@@ -402,10 +399,7 @@ function ($rootScope, $scope, $timeout, $window, $document, ArtistFactory,
 
 	// Compact/normal layout of the Albums view
 	$scope.albumsCompactLayout = (localStorage.getItem('oc_music_albums_compact') === 'true');
-	$scope.toggleAlbumsCompactLayout = function(useCompact /*optional, invert current value if omitted */) {
-		if (typeof useCompact === 'undefined') {
-			useCompact = !$scope.albumsCompactLayout;
-		}
+	$scope.toggleAlbumsCompactLayout = function(useCompact = !$scope.albumsCompactLayout) {
 		$scope.albumsCompactLayout = useCompact;
 		$('#albums').toggleClass('compact', useCompact);
 		$rootScope.$emit('albumsLayoutChanged');
@@ -418,10 +412,7 @@ function ($rootScope, $scope, $timeout, $window, $document, ArtistFactory,
 
 	// Flat/tree layout of the Folders view
 	$scope.foldersFlatLayout = (localStorage.getItem('oc_music_folders_flat') === 'true');
-	$scope.toggleFoldersFlatLayout = function(useFlat /*optional, invert current value if omitted */) {
-		if (typeof useFlat === 'undefined') {
-			useFlat = !$scope.foldersFlatLayout;
-		}
+	$scope.toggleFoldersFlatLayout = function(useFlat = !$scope.foldersFlatLayout) {
 		$scope.foldersFlatLayout = useFlat;
 		$rootScope.$emit('foldersLayoutChanged');
 

js/app/controllers/playercontroller.js

@@ -7,7 +7,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
  * @copyright Morris Jobke 2013
- * @copyright Pauli Järvinen 2017 - 2022
+ * @copyright Pauli Järvinen 2017 - 2023
  */
 
 import radioIconPath from '../../../img/radio-file.svg';
@@ -208,8 +208,7 @@ function ($scope, $rootScope, playlistService, Audio, gettextCatalog, Restangula
 		}
 	}
 
-	function getRadioTitle(radioTrack, failCounter /*optional, internal*/) {
-		failCounter = failCounter || 0;
+	function getRadioTitle(radioTrack, failCounter = 0 /*internal*/) {
 		abortRadioTitleFetch = $q.defer();
 		const config = {timeout: abortRadioTitleFetch.promise};
 		const metaType = radioTrack.metadata?.type; // request the same metadata type as previously got (if any)
@@ -259,7 +258,7 @@ function ($scope, $rootScope, playlistService, Audio, gettextCatalog, Restangula
 		return null;
 	}
 
-	function setCurrentTrack(playlistEntry, startOffset /*optional*/, gapless /*optional*/) {
+	function setCurrentTrack(playlistEntry, startOffset = 0, gapless = false) {
 		let track = playlistEntry ? playlistEntry.track : null;
 
 		if (track !== null) {
@@ -276,7 +275,7 @@ function ($scope, $rootScope, playlistService, Audio, gettextCatalog, Restangula
 		$scope.shiftHeldDown = false;
 	}
 
-	function playCurrentTrack(startOffset /*optional*/) {
+	function playCurrentTrack(startOffset = 0) {
 		// the playback may have been stopped and currentTrack vanished during the debounce time
 		if ($scope.currentTrack) {
 			if ($scope.currentTrack.type === 'radio') {
@@ -318,7 +317,7 @@ function ($scope, $rootScope, playlistService, Audio, gettextCatalog, Restangula
 	 */
 	let debouncedPlayCurrentTrack = _.debounce(playCurrentTrack, 300);
 
-	function playTrack(track, startOffset /*optional*/, gapless /*optional*/) {
+	function playTrack(track, startOffset = 0, gapless = false) {
 		$scope.currentTrack = track;
 
 		// Don't indicate support for seeking before we actually know its status for the new track.
@@ -509,7 +508,7 @@ function ($scope, $rootScope, playlistService, Audio, gettextCatalog, Restangula
 		$timeout(() => $scope.playPauseContextMenuVisible = false);
 	});
 
-	$scope.next = function(startOffset /*optional*/, gapless /*optional*/) {
+	$scope.next = function(startOffset = 0, gapless = false) {
 		let entry = playlistService.jumpToNextTrack();
 
 		// For ordinary tracks, skip the tracks with unsupported MIME types.
@@ -613,7 +612,7 @@ function ($scope, $rootScope, playlistService, Audio, gettextCatalog, Restangula
 
 	$scope.seekForward = $scope.player.seekForward;
 
-	playlistService.subscribe('play', function(_event, _playingView /*optional, ignored*/, startOffset /*optional*/) {
+	playlistService.subscribe('play', function(_event, _playingView = null, startOffset = 0) {
 		$scope.next(startOffset); /* fetch track and start playing*/
 	});
 

js/app/controllers/views/alltracksviewcontroller.js

@@ -5,7 +5,7 @@
  * later. See the COPYING file.
  *
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
- * @copyright Pauli Järvinen 2018 - 2022
+ * @copyright Pauli Järvinen 2018 - 2023
  */
 
 
@@ -35,7 +35,7 @@ angular.module('Music').controller('AllTracksViewController', [
 			_.each(_unsubFuncs, function(func) { func(); });
 		});
 
-		function play(startIndex /*optional*/) {
+		function play(startIndex = 0) {
 			playlistService.setPlaylist('alltracks', _tracks, startIndex);
 			playlistService.publish('play');
 		}

js/app/controllers/views/foldersviewcontroller.js

@@ -5,7 +5,7 @@
  * later. See the COPYING file.
  *
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
- * @copyright Pauli Järvinen 2019 - 2022
+ * @copyright Pauli Järvinen 2019 - 2023
  */
 
 
@@ -30,10 +30,10 @@ angular.module('Music').controller('FoldersViewController', [
 			unsubFuncs.push( $rootScope.$on(event, handler) );
 		}
 
-		function playPlaylist(listId, tracks, startFromTrackId /*optional*/) {
+		function playPlaylist(listId, tracks, startFromTrackId = undefined) {
 			let startIndex = null;
 			if (startFromTrackId !== undefined) {
-				startIndex = _.findIndex(tracks, function(i) {return i.track.id == startFromTrackId;});
+				startIndex = _.findIndex(tracks, (i) => i.track.id == startFromTrackId);
 			}
 			playlistService.setPlaylist(listId, tracks, startIndex);
 			playlistService.publish('play');

js/app/controllers/views/genresviewcontroller.js

@@ -5,7 +5,7 @@
  * later. See the COPYING file.
  *
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
- * @copyright Pauli Järvinen 2020, 2021
+ * @copyright Pauli Järvinen 2020 - 2023
  */
 
 
@@ -34,10 +34,10 @@ angular.module('Music').controller('GenresViewController', [
 			$scope.$parent.filesWithUnscannedGenre = null;
 		};
 
-		function playPlaylist(listId, tracks, startFromTrackId /*optional*/) {
+		function playPlaylist(listId, tracks, startFromTrackId = undefined) {
 			let startIndex = null;
 			if (startFromTrackId !== undefined) {
-				startIndex = _.findIndex(tracks, function(i) {return i.track.id == startFromTrackId;});
+				startIndex = _.findIndex(tracks, (i) => i.track.id == startFromTrackId);
 			}
 			playlistService.setPlaylist(listId, tracks, startIndex);
 			playlistService.publish('play');

js/app/controllers/views/playlistviewcontroller.js

@@ -7,7 +7,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
  * @copyright Morris Jobke 2013
- * @copyright Pauli Järvinen 2017 - 2021
+ * @copyright Pauli Järvinen 2017 - 2023
  */
 
 
@@ -58,7 +58,7 @@ angular.module('Music').controller('PlaylistViewController', [
 			});
 		};
 
-		function play(startIndex /*optional*/) {
+		function play(startIndex = 0) {
 			let id = 'playlist-' + $scope.playlist.id;
 			playlistService.setPlaylist(id, $scope.tracks, startIndex);
 			playlistService.publish('play');

js/app/controllers/views/podcastsviewcontroller.js

@@ -5,7 +5,7 @@
  * later. See the COPYING file.
  *
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
- * @copyright Pauli Järvinen 2021, 2022
+ * @copyright Pauli Järvinen 2021 - 2023
  */
 
 angular.module('Music').controller('PodcastsViewController', [
@@ -122,14 +122,14 @@ angular.module('Music').controller('PodcastsViewController', [
 			updateHighlight(playlistId);
 		});
 
-		subscribe('scrollToPodcastEpisode', function(_event, episodeId, animationTime /* optional */) {
+		subscribe('scrollToPodcastEpisode', function(_event, episodeId, animationTime = 500) {
 			let episode = libraryService.getPodcastEpisode(episodeId);
 			if (episode) {
 				$scope.$parent.scrollToItem('podcast-channel-' + episode.channel.id, animationTime);
 			}
 		});
 
-		subscribe('scrollToPodcastChannel', function(_event, channelId, animationTime /* optional */) {
+		subscribe('scrollToPodcastChannel', function(_event, channelId, animationTime = 500) {
 			$scope.$parent.scrollToItem('podcast-channel-' + channelId, animationTime);
 		});
 

js/app/controllers/views/radioviewcontroller.js

@@ -5,7 +5,7 @@
  * later. See the COPYING file.
  *
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
- * @copyright Pauli Järvinen 2020, 2021
+ * @copyright Pauli Järvinen 2020 - 2023
  */
 
 
@@ -75,7 +75,7 @@ angular.module('Music').controller('RadioViewController', [
 			);
 		}
 
-		function play(startIndex /*optional*/) {
+		function play(startIndex = 0) {
 			playlistService.setPlaylist('radio', $scope.stations, startIndex);
 			playlistService.publish('play');
 		}

js/app/directives/albumart.js

@@ -7,7 +7,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
  * @copyright 2013 Morris Jobke
- * @copyright 2016 - 2022 Pauli Järvinen
+ * @copyright 2016 - 2023 Pauli Järvinen
  *
  */
 
@@ -21,12 +21,12 @@ angular.module('Music').directive('albumart', [function() {
 		element.css('background-image', 'url(' + imageUrl + ')');
 	}
 
-	function setPlaceholder(element, text, seed /*optional*/) {
+	function setPlaceholder(element, text, seed = null) {
 		if (text) {
 			// remove background image
 			element.css('background-image', '');
 			// add placeholder stuff
-			element.imageplaceholder(seed || text, text);
+			element.imageplaceholder(seed ?? text, text);
 			// remove inlined size-related style properties set by imageplaceholder() to allow
 			// dynamic changing between mobile and desktop styles when window size changes
 			element.css('line-height', '');

js/app/directives/inviewobserver.js

@@ -5,7 +5,7 @@
  * later. See the COPYING file.
  *
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
- * @copyright 2019 - 2022 Pauli Järvinen
+ * @copyright 2019 - 2023 Pauli Järvinen
  *
  */
 
@@ -117,7 +117,7 @@ function($rootScope, $timeout, inViewService) {
 	/**
 	 * Initial setup of the in-view-port statuses of the available instances
 	 */
-	function initInViewRange(skipDelays/*optional*/) {
+	function initInViewRange(skipDelays = false) {
 		let length = _instances.length;
 		let i;
 
@@ -204,7 +204,7 @@ function($rootScope, $timeout, inViewService) {
 	/**
 	 * Update in-view-port status of the given instance
 	 */
-	function updateInViewStatus(inst, skipDelays/*optional*/) {
+	function updateInViewStatus(inst, skipDelays = false) {
 		skipDelays = skipDelays || false;
 
 		let wasInViewPort = inst.inViewPort;
@@ -285,7 +285,7 @@ function($rootScope, $timeout, inViewService) {
 		invalidateInViewRange();
 	}
 
-	function updateStatusForAll(skipDelays/*optional*/) {
+	function updateStatusForAll(skipDelays = false) {
 		_(_instances).each(function(inst) {
 			updateInViewStatus(inst, skipDelays);
 		});

js/app/directives/tracklist.js

@@ -7,7 +7,7 @@
  * @author Moritz Meißelbach <moritz@meisselba.ch>
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
  * @copyright 2017 Moritz Meißelbach
- * @copyright 2018 - 2021 Pauli Järvinen
+ * @copyright 2018 - 2023 Pauli Järvinen
  *
  */
 
@@ -151,7 +151,7 @@ function ($rootScope, $interpolate, gettextCatalog) {
 		 * @param string className (optional)
 		 * @returns {HTMLLIElement}
 		 */
-		function getTrackNode(track, index, className) {
+		function getTrackNode(track, index, className = null) {
 			let listItem = document.createElement('li');
 
 			let listItemContent = document.createElement('div');

js/app/services/inviewservice.js

@@ -5,7 +5,7 @@
  * later. See the COPYING file.
  *
  * @author Pauli Järvinen <pauli.jarvinen@gmail.com>
- * @copyright 2019 Pauli Järvinen
+ * @copyright 2019 - 2023 Pauli Järvinen
  *
  */
 
@@ -38,11 +38,8 @@ angular.module('Music').service('inViewService', ['$rootScope', function($rootSc
 		 * @param int topMargin Optional top extension in pixels (use negative value for reduction)
 		 * @param int bottomMargin Optional bottom extension in pixels (use negative value for reduction)
 		 */
-		isElementInViewPort: function(el, topMargin/*optional*/, bottomMargin/*optional*/) {
+		isElementInViewPort: function(el, topMargin = 0, bottomMargin = 0) {
 			if (el) {
-				topMargin = topMargin || 0;
-				bottomMargin = bottomMargin || 0;
-
 				if (dirty) {
 					updateHeights();
 				}