Commit ce056f7d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige carga de pdf interno y muestra de dominio 

Arregla condición de carrera entre la carga del visor de pdf y la
recepción de los datos.

Actualiza submódulo de plantillas para mejorar la captura del dominio
del enlace externo.
parent 6ecc100c

public/javascript/app/designs/details/main/DocumentPDF.js

+31 −6
Original line number Diff line number Diff line
@@ -54,19 +54,44 @@ define([ 


			this._checkPathVariableId();



			var envDfd = window.env;

			if (!envDfd) {

				return;

			}



			envDfd.then(lang.hitch(this, function(envData) {



				this._envData = envData;



				this._emitEvt('GET', {

					target: this.target,

					requesterId: this.ownChannel,

					id: this.pathVariableId

				});

			}));

		},



		_itemAvailable: function(item) {



			var documentData = item.data,

				pdfUrl = documentData.internalUrl,

				pdfUrlProto = documentData.internalUrl.replace('/api', redmicConfig.apiUrlVariable),

				pdfUrl = redmicConfig.getServiceUrl(pdfUrlProto, this._envData),

				widgetInstance = this._getWidgetInstance('pdf');



			var callback = lang.hitch(this, this._loadPdfInWidget, pdfUrl);



			if (!widgetInstance) {

				this._onceEvt('LAYOUT_COMPLETE', callback);

			} else {

				callback();

			}

		},



		_loadPdfInWidget: function(pdfUrl) {



			var HOSTED_VIEWER_ORIGINS = [null, this._envData.apiUrl];

			var widgetInstance = this._getWidgetInstance('pdf');



			if (!widgetInstance) {

				return;

			}

templates @ 11626d87

Compare 55982b6d to 11626d87
Original line number Diff line number Diff line 
Subproject commit 55982b6d3f84fae9368db04121e83cbd1d006b55
 
Subproject commit 11626d87ed36f990bd00d5bdfe764c5f2e029d3a