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

Quita todo indicador de cargando tras error de red 

Para evitar dejar la app inservible cuando ocurre algún error de
comunicación, se manda a quitar cualquier pantalla de carga existente si
se recibe alguna respuesta que no sea exitosa.
parent a56164c3

public/javascript/redmic/modules/base/Loading.js

+36 −7
Original line number Diff line number Diff line 
define([

	'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'dojo/query'

	, 'put-selector/put'

	, 'redmic/modules/base/_Module'

	, 'templates/LoadingArrows'

], function(

	declare

	, lang

	, query

	, put

	, _Module

	, LoadingTemplate

) {



	return declare(_Module, {

		//	summary:

		//		Módulo para representar cuando otros módulos están esperando a que ocurra algo.
@@ -29,7 +32,8 @@ define([ 
					LOADING: 'loading',

					LOADING_DRAWN: 'loadingDrawn',

					LOADED: 'loaded',

					LOAD_FINISHED: 'loadFinished'

					LOAD_FINISHED: 'loadFinished',

					ABORT_ALL_LOADING: 'abortAllLoading'

				},



				_activeGlobalLoadings: 0,
@@ -52,6 +56,9 @@ define([ 
			},{

				channel : this.getChannel('LOADED'),

				callback: '_subLoaded'

			},{

				channel : this.getChannel('ABORT_ALL_LOADING'),

				callback: '_subAbortAllLoading'

			});

		},
@@ -80,7 +87,6 @@ define([ 
			if (localNode) {

				this._localLoading({

					node: localNode,

					moduleChannel: moduleChannel,

					loadingClassNames: loadingClassNames

				});

			} else {
@@ -91,7 +97,6 @@ define([ 
		_localLoading: function(args) {



			var node = args.node,

				moduleChannel = args.moduleChannel,

				loadingClassNames = args.loadingClassNames;



			this._applyLoadingAttr(node);
@@ -152,20 +157,20 @@ define([ 
				moduleChannel = req.moduleChannel;



			if (localNode) {

				this._localLoaded(localNode, moduleChannel);

				this._localLoaded(localNode);

			} else {

				this._globalLoaded();

			}

		},



		_localLoaded: function(node, moduleChannel) {

		_localLoaded: function(node) {



			this._hideLoading(node, this.loadingClass);

		},



		_globalLoaded: function() {



			if (this._activeGlobalLoadings) {

			if (this._activeGlobalLoadings && this.globalNode) {

				this._activeGlobalLoadings--;

				!this._activeGlobalLoadings && this._hideLoading(this.globalNode, this.globalLoadingClass);

			}
@@ -233,6 +238,30 @@ define([ 


			this._removeLoadingAttr(node);

			this._emitEvt('LOADED');

		},



		_subAbortAllLoading: function() {



			this._hideAllLoadingNodes();

		},



		_hideAllLoadingNodes: function() {



			if (!this.globalNode) {

				return;

			}



			var loadingParentNodes = query('[loading]', this.globalNode);



			for (var i = 0; i < loadingParentNodes.length; i++) {

				var loadingParentNode = loadingParentNodes[i];



				if (loadingParentNode === this.globalNode) {

					this._globalLoaded();

				} else {

					this._localLoaded(loadingParentNode);

				}

			}

		}

	});

});

public/javascript/redmic/modules/store/RestManager.js

+7 −2
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ define([ 
					SAVE: 'save',

					REMOVE: 'remove',

					TARGET_LOADING: 'targetLoading',

					TARGET_LOADED: 'targetLoaded'

					TARGET_LOADED: 'targetLoaded',

					ABORT_ALL_LOADING: 'abortAllLoading'

				},

				actions: {

					REQUEST: 'request',
@@ -42,7 +43,8 @@ define([ 
					REMOVE: 'remove',

					REMOVED: 'removed',

					TARGET_LOADING: 'targetLoading',

					TARGET_LOADED: 'targetLoaded'

					TARGET_LOADED: 'targetLoaded',

					ABORT_ALL_LOADING: 'abortAllLoading'

				},



				// TODO esto quizá no debería ir aquí, sino en el comunicador de errores
@@ -115,6 +117,9 @@ define([ 
			},{

				event: 'TARGET_LOADED',

				channel: this.getChannel('TARGET_LOADED')

			},{

				event: 'ABORT_ALL_LOADING',

				channel: this._buildChannel(this.loadingChannel, this.actions.ABORT_ALL_LOADING)

			});

		},

public/javascript/redmic/modules/store/RestManagerImpl.js

+2 −0
Original line number Diff line number Diff line
@@ -377,6 +377,8 @@ define([ 
			var res = err.response,

				status = res.status;



			this._emitEvt('ABORT_ALL_LOADING');



			if (status === 401) {

				this._onRequestPermissionError(res);

			} else if (status === 502) {