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

Centraliza petición de información de entorno 

El módulo Router se encarga siempre de pedir la info, pero antes crea un
Deferred accesible por todos para que puedan esperar por la respuesta.
parent 8a6650b1

public/javascript/app/components/Router.js

+16 −5
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ define([ 
	, 'app/redmicConfig'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'dojo/Deferred'

	, 'dojo/dom'

	, 'dojo/dom-attr'

	, 'dojo/has'
@@ -31,6 +32,7 @@ define([ 
	, redmicConfig

	, declare

	, lang

	, Deferred

	, dom

	, domAttr

	, has
@@ -72,6 +74,8 @@ define([ 
			}

		};



	getGlobalContext().env = new Deferred();



	if (!CheckBrowser.isSupported()) {

		hideNativeLoadingNode();

		getGlobalContext().location.href = '/noSupportBrowser';
@@ -287,12 +291,19 @@ define([ 


		_getEnv: function() {



			!getGlobalContext().env && request('/env', {

			var envDfd = getGlobalContext().env;



			if (envDfd && !envDfd.isFulfilled()) {

				request('/env', {

					handleAs: 'json'

			}).then(lang.hitch(this, function(data) {

				}).then(lang.hitch(envDfd, function(data) {



				getGlobalContext().env = data;

					this.resolve(data);

				}),lang.hitch(envDfd, function(error) {



					this.reject(error);

				}));

			}

		},



		_subCredentialsRemoved: function() {

public/javascript/app/user/views/_ExternalUserBaseView.js

+3 −8
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ define([ 
	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "dojo/_base/kernel"

	, "dojo/request"

	, "put-selector/put"



	, "dijit/form/Form"
@@ -24,7 +23,6 @@ define([ 
	, declare

	, lang

	, kernel

	, request

	, put

){

	return declare(_View, {
@@ -74,12 +72,9 @@ define([ 


			this.addChild(this.template);



			if (window.env) {

				this._showVersion(window.env);

			} else {

				request("/env", {

					handleAs: "json"

				}).then(lang.hitch(this, this._showVersion));

			var envDfd = window.env;

			if (envDfd) {

				envDfd.then(lang.hitch(this, this._showVersion));

			}



			this.inherited(arguments);

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

+11 −4
Original line number Diff line number Diff line
@@ -14,9 +14,7 @@ define([ 


		constructor: function(args) {



			this.config = {

				debug: window.env ? window.env.debug : false

			};

			this.config = {};



			lang.mixin(this, this.config, args);
@@ -41,7 +39,16 @@ define([ 


		_onNotImplementedMethod: function(method, props) {



			this.debug && this._showNotImplementedMethodWarning(method, props);

			var envDfd = window.env;



			if (!envDfd) {

				return;

			}



			envDfd.then(lang.hitch(this, function(method, props, env) {



				env.debug && this._showNotImplementedMethodWarning(method, props);

			}, method, props));

		},



		_showNotImplementedMethodWarning: function(method, props) {