fix(ILMS-391): Nothing happens after pressing the convert button. (#139)

* ILMS-391 Nothing happens after pressing the convert button.
Fixed minified build.

* Synchronize default plugins with v7 Player Studio.

Author: vladimir-poleh

app/js/controllers/playerListCtrl.js

@@ -2,8 +2,43 @@
 
 /* Controllers */
 
-angular.module('KMCModule').controller('PlayerListCtrl',
-	['apiService', 'loadINI', '$location', '$rootScope', '$scope', '$filter', '$modal', '$timeout', '$log', "$compile", "$window", 'localStorageService', 'requestNotificationChannel', 'PlayerService', '$q', 'utilsSvc', 'PermissionsService',
+angular.module('KMCModule')
+	.controller('PlayerUpgradeModeCtrl',
+		function ($scope, $modalInstance, settings) {
+			$scope.playerId = '';
+			$scope.mode = '';
+
+			$scope.close = function (result) {
+				if (!result) {
+					return $modalInstance.close();
+				}
+
+				$modalInstance.close({
+					mode: this.mode,
+					templateId: Number(this.playerId)
+				});
+			};
+
+			$scope.cancel = function () {
+				$modalInstance.dismiss('cancel');
+			};
+
+			$scope.validate = function () {
+				if (!this.mode) {
+					return false;
+				}
+
+				if (this.mode === 'template' && (this.playerId === '') || isNaN(this.playerId)) {
+					return false;
+				}
+
+				return true;
+			};
+
+			angular.extend($scope, settings);
+		})
+	.controller('PlayerListCtrl',
+		['apiService', 'loadINI', '$location', '$rootScope', '$scope', '$filter', '$modal', '$timeout', '$log', "$compile", "$window", 'localStorageService', 'requestNotificationChannel', 'PlayerService', '$q', 'utilsSvc', 'PermissionsService',
 		function (apiService, loadINI, $location, $rootScope, $scope, $filter, $modal, $timeout, $log, $compile, $window, localStorageService, requestNotificationChannel, PlayerService, $q, utilsSvc, PermissionsService) {
 			// start request to show the spinner. When data is rendered, the onFinishRender directive will hide the spinner
 			requestNotificationChannel.requestStarted('list');
@@ -348,7 +383,7 @@ angular.module('KMCModule').controller('PlayerListCtrl',
 					}
 				});
 				modal.result.then(function (result) {
-					if (result && result.result) {
+					if (result) {
 						var confirmMsg = $filter('translate')('Do you want to convert this V2 player to a V7 player?<br/><br/>' +
 								'Player\'s customization and configuration will be lost<br/>' +
 								'Player\'s embeds will need to be modified.<br/><br/>' +
@@ -405,38 +440,4 @@ angular.module('KMCModule').controller('PlayerListCtrl',
 			};
 		}
 	])
-	.controller('PlayerUpgradeModeCtrl',
-		function ($scope, $modalInstance, settings) {
-			$scope.playerId = '';
-			$scope.mode = '';
-
-			$scope.close = function (result) {
-				var modalResult = result ? {
-					result: true,
-					mode: this.mode,
-					templateId: Number(this.playerId)
-				} : {
-					result: false
-				};
-				$modalInstance.close(modalResult);
-			};
-
-			$scope.cancel = function () {
-				$modalInstance.dismiss('cancel');
-			};
-
-			$scope.validate = function () {
-				if (this.mode === '') {
-					return false;
-				}
-
-				if (this.mode === 'template' && (this.playerId === '') || isNaN(this.playerId)) {
-					return false;
-				}
-
-				return true;
-			};
-
-			angular.extend($scope, settings);
-		})
 ;

app/js/services/services.js

@@ -650,38 +650,44 @@ KMCServices.factory('PlayerDataService', ['apiService', '$q', '$filter',
 					'uiConf:name': name,
 					'uiConf:tags': 'kalturaPlayerJs,player,ovp',
 					'uiConf:config': '{\n' +
-						'    "disableUserCache": false,\n' +
-						'    "plugins": {\n' +
-						'        "kava": {},\n' +
-						'        "playkit-js-hotspots": {},\n' +
-						'        "navigation": {},\n' +
-						'        "playkit-js-transcript": {\n' +
-						'            "position": "bottom",\n' +
-						'            "showTime": true,\n' +
-						'            "expandOnFirstPlay": false,\n' +
-						'            "downloadDisabled": true,\n' +
-						'            "printDisabled": true\n' +
-						'        },\n' +
-						'        "playkit-js-info": {},\n' +
-						'        "dualscreen": {},' +
-						'        "timeline": {},\n' +
-						'        "ivq": {},\n' +
-						'        "kalturaCuepoints": {}' +
-						'    },\n' +
-						'    "viewability": {\n' +
-						'        "playerThreshold": 50\n' +
-						'    },\n' +
-						'    "provider": {\n' +
-						'        "env": {}\n' +
-						'    },\n' +
-						'    "playback": {\n' +
-						'        "enabled": true\n' +
-						'    }\n' +
+						'\t"disableUserCache": false,\n' +
+						'\t"plugins": {\n' +
+						'\t\t"kava": {},\n' +
+						'\t\t"playkit-js-hotspots": {},\n' +
+						'\t\t"navigation": {},\n' +
+						'\t\t"playkit-js-transcript": {\n' +
+						'\t\t\t"position": "bottom",\n' +
+						'\t\t\t"showTime": true,\n' +
+						'\t\t\t"expandOnFirstPlay": false,\n' +
+						'\t\t\t"downloadDisabled": true,\n' +
+						'\t\t\t"printDisabled": true\n' +
+						'\t\t},\n' +
+						'\t\t"playkit-js-info": {},\n' +
+						'\t\t"dualscreen": {},\n' +
+						'\t\t"timeline": {},\n' +
+						'\t\t"ivq": {},\n' +
+						'\t\t"kalturaCuepoints": {},\n' +
+						'\t\t"uiManagers": {},\n' +
+						'\t\t"playlist": {}\n' +
+						'\t},\n' +
+						'\t"viewability": {\n' +
+						'\t\t"playerThreshold": 50\n' +
+						'\t},\n' +
+						'\t"provider": {\n' +
+						'\t\t"env": {}\n' +
+						'\t},\n' +
+						'\t"playback": {\n' +
+						'\t\t"enabled": true\n' +
+						'\t},\n' +
+						'\t"playlist": {\n' +
+						'\t\t"options": {},\n' +
+						'\t\t"countdown": {}\n' +
+						'\t}\n' +
 						'}',
-					'uiConf:confVars': '{"versions":{"kaltura-ovp-player":"{latest}","playkit-hotspots":"{latest}",' +
-						'"playkit-navigation":"{latest}","playkit-transcript":"{latest}","playkit-info":"{latest}",' +
-						'"playkit-ivq":"{latest}","playkit-timeline":"{latest}","playkit-kaltura-cuepoints":"{latest}",' +
-						'"playkit-dual-screen":"{latest}"},"langs":["en"]}',
+					'uiConf:confVars': '{"versions":{"kaltura-ovp-player":"{latest}","playkit-navigation":"{latest}",' +
+						'"playkit-transcript":"{latest}","playkit-hotspots":"{latest}","playkit-info":"{latest}",' +
+						'"playkit-dual-screen":"{latest}","playkit-ivq":"{latest}","playkit-playlist":"{latest}",' +
+						'"playkit-timeline":"{latest}","playkit-kaltura-cuepoints":"{latest}"},"langs":["en"]}',
 					'uiConf:creationMode': 2,
 				};