template-engine
Advanced tools
Comparing version 0.4.11 to 0.4.12
@@ -69,3 +69,3 @@ var Core = require('core'); | ||
console.log('XXXXXXXXXXXXXX', ocdnKey, resourcePath); | ||
//console.log('XXXXXXXXXXXXXX', ocdnKey, resourcePath); | ||
@@ -72,0 +72,0 @@ if(resourcePath.indexOf('http://')>-1 || resourcePath.indexOf('https://')>-1){ |
@@ -23,3 +23,3 @@ var Class = require("core").Class; | ||
*/ | ||
var DriverRemote = function(){ | ||
var DriverRemote = function () { | ||
@@ -29,18 +29,7 @@ /** @ignore */ | ||
/** | ||
* @property | ||
* @private | ||
*/ | ||
//this._params = null; | ||
/** | ||
* @property | ||
* @private | ||
*/ | ||
//this._loader = null; | ||
/** @ignore */ | ||
this.initialize = function(params){ | ||
this.initialize = function (params) { | ||
this.parent(); | ||
if(!params || typeof params != "object" || params.constructor != Object){ | ||
if (!params || typeof params != "object" || params.constructor != Object) { | ||
console.warn('DRIVER_REMOTE/initialize', 'WRONG_PARAMS', params); | ||
throw DriverRemote.Exception.WRONG_PARAMS; | ||
@@ -58,5 +47,6 @@ } | ||
this.load = function(){ | ||
try{ | ||
try { | ||
var opalRequest = new OpalRequest(this._params); | ||
}catch(e){ | ||
} catch(e) { | ||
console.warn('DRIVER_REMOTE/load', 'WRONG_OPAL_PARAMS', this._params); | ||
throw DriverRemote.Exception.OPAL_WRONG_PARAMS; | ||
@@ -74,3 +64,3 @@ } | ||
this._loader.addEventListener(Loader.ERROR, this._onError, this); | ||
this._loader.setTimeout(DriverRemote.TIMEOUT); | ||
this._loader.load(opalRequest); | ||
@@ -90,3 +80,3 @@ }; | ||
this._onHttpResponse = function(e){ | ||
console.log(e); | ||
console.warn('DRIVER_REMOTE/_onHttpResponse', this._params, e); | ||
//TODO dodac sprawdzanie typu bledu i nadawanie kodu i msg dla emitowanego ErrorEvent | ||
@@ -101,6 +91,6 @@ //FIXME to wogole jest "popsute" bo nie przekazuje bledu z opala dalej | ||
this._onError = function(e){ | ||
console.log(e); | ||
console.warn('DRIVER_REMOTE/_onError', e); | ||
//TODO dodac sprawdzanie typu bledu i nadawanie kodu i msg dla emitowanego ErrorEvent | ||
//FIXME to wogole jest "popsute" bo nie przekazuje bledu z opala dalej | ||
this.dispatchEvent(new ErrorEvent(DriverAbstract.ERROR, e.data)); | ||
this.dispatchEvent(new ErrorEvent(DriverAbstract.ERROR, this._params, e.data)); | ||
}; | ||
@@ -128,2 +118,8 @@ }; | ||
/** | ||
* @static | ||
* @constant | ||
*/ | ||
DriverRemote.TIMEOUT = 4000; | ||
exports.DriverRemote = DriverRemote; |
@@ -247,3 +247,3 @@ var Event = require('core').Event.Event; | ||
} else { | ||
console.warn(DriverSession.Exception.INVALID_HOST, headers.host); | ||
console.warn('DriverSession/', DriverSession.Exception.INVALID_HOST, headers.host); | ||
} | ||
@@ -254,3 +254,3 @@ //check if cookies are valid | ||
} else { | ||
console.warn(DriverSession.Exception.COOKIES_NOT_FOUND); | ||
console.warn('DriverSession/', DriverSession.Exception.COOKIES_NOT_FOUND); | ||
} | ||
@@ -292,3 +292,3 @@ | ||
} else { | ||
console.warn(DriverSession.Exception.INVALID_UBI, cookies.onet_ubi); | ||
console.warn('DriverSession/', DriverSession.Exception.INVALID_UBI, cookies.onet_ubi); | ||
} | ||
@@ -309,3 +309,3 @@ | ||
if(this._cookieSid === null && this._cookieCid === null) { | ||
console.warn(DriverSession.Exception.INVALID_COOKIES, headerCookies); | ||
console.warn('DriverSession/', DriverSession.Exception.INVALID_COOKIES, headerCookies); | ||
} | ||
@@ -454,3 +454,3 @@ }; | ||
sessionRequest.socket.on('timeout', function() { | ||
console.warn('Session broker error: timeout'); | ||
console.warn('DriverSession/', 'Session broker error: timeout'); | ||
sessionRequest.abort(); | ||
@@ -461,3 +461,3 @@ that.dispatchEvent(new Event(DriverAbstract.LOADED, DriverSession.USER_NOT_LOGGED)); | ||
sessionRequest.on('error', function(e) { | ||
console.warn('Session broker error: ', e.message); | ||
console.warn('DriverSession/', 'Session broker error: ', e.message); | ||
that.dispatchEvent(new Event(DriverAbstract.LOADED, DriverSession.USER_NOT_LOGGED)); | ||
@@ -529,3 +529,3 @@ }); | ||
this._opalResTime = Date.now() - this._opalResTime; | ||
console.info('OPAL Response (onComplete) to DriverSession.OPENAPI_URL time: ', this._opalResTime); | ||
console.info('DriverSession/', 'OPAL Response (onComplete) to DriverSession.OPENAPI_URL time: ', this._opalResTime); | ||
var mailboxInfo = e.data.getBody(); | ||
@@ -543,4 +543,4 @@ if(mailboxInfo._result.data.hasOwnProperty('counter')) { | ||
this._opalResTime = Date.now() - this._opalResTime; | ||
console.info('OPAL Response (onError) to DriverSession.OPENAPI_URL time: ', this._opalResTime); | ||
console.warn('OPAL Error: DriverSession.OPENAPI_URL ->', e.message); | ||
console.info('DriverSession/', 'OPAL Response (onError) to DriverSession.OPENAPI_URL time: ', this._opalResTime); | ||
console.warn('DriverSession/', 'OPAL Error: DriverSession.OPENAPI_URL ->', e.message); | ||
this._userData.inbox_info = 0; | ||
@@ -547,0 +547,0 @@ this.dispatchEvent(new Event(DriverAbstract.LOADED, this._userData)); |
{ | ||
"name": "template-engine", | ||
"version": "0.4.11", | ||
"version": "0.4.12", | ||
"description": "Engine that renders templates of any kind", | ||
@@ -5,0 +5,0 @@ "contributors": [ |
6007737
38852