Merge branch 'hotfix/5.2.13'

polimediaupv · Mar 2, 2018 · 034eb82 · 034eb82
2 parents 04bf299 + 51592d5
commit 034eb82
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+* Paella 5.2.13
+
+  * Fixed a bug when loading captions in an not supported format
+
 * Paella 5.2.12
 
   * Changed function to build localization files

diff --git a/localization/dictionary_es.json b/localization/dictionary_es.json
@@ -50,5 +50,6 @@
 	"Live streaming mode: This is a live video, so, some capabilities of the player are disabled":"<h2>Vídeo en directo</h2><br/>Esto es un vídeo en directo, así que algunas de las funciones del reproductor están deshabilitadas",
 	"You are using Firefox version, and some required video playback capabilities are not available until Firefox min_version. Please, update your browser and try again.":"Estás utilizando Firefox version, y algunas capacidades de vídeo necesarias no están disponibles hasta Firefox min_version. Por favor, actualiza tu navegador y prueba otra vez.",
 	"This video is not compatible with any codec installed in your system":"Este vídeo no es compatible con ningún codec instalado en su sistema",
-	"Could not load the video":"No se ha podido cargar el vídeo"
+	"Could not load the video":"No se ha podido cargar el vídeo",
+	"Error! Captions format not supported.":"Error! El formato de los subtitulos no está soportado."
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "paellaplayer",
-  "version": "5.2.12",
+  "version": "5.2.13",
   "description": "Paella Player",
   "license": "ECL-2.0",
   "repository": {

diff --git a/src/06_1_captions.js b/src/06_1_captions.js
@@ -187,7 +187,16 @@ Class ("paella.captions.Caption", {
 			var parser = captionParserManager._formats[self._format];			
 			if (parser == undefined) {
 				base.log.debug("Error adding captions: Format not supported!");
-				if (next) { next(true); }
+				paella.player.videoContainer.duration(true)
+				.then((duration)=>{
+					self._captions = [{
+						id: 0,
+		            	begin: 0,
+		            	end: duration,
+		            	content: base.dictionary.translate("Error! Captions format not supported.")
+					}];
+					if (next) { next(true); }
+				});
 			}
 			else {
 				parser.parse(dataRaw, self._lang.code, function(err, c) {