Rename F.onLocate to F.onLocale.

petersirka · petersirka · commit a7ef3844c3e8 · 2016-10-20T13:21:54.000+02:00
diff --git a/changes.txt b/changes.txt
@@ -6,6 +6,8 @@
 - updated: `SINGLETON(name, [def = {}])`
 - updated: `debug.js` add timestamps
 
+-renamed: `F.onLocate` renamed to `F.onLocale`
+
 ======= 2.1.0
 
 - added: `F.sitemap_add(string)` for adding entries to sitemap by Martin Smola <https://github.com/molda>
diff --git a/index.js b/index.js
@@ -714,7 +714,23 @@ function Framework() {
 // PROTOTYPES
 // ======================================================
 
-Framework.prototype.__proto__ = new events.EventEmitter();
+Framework.prototype = {
+	get onLocate() {
+		return this.onLocale;
+	},
+	set onLocate(value) {
+		OBSOLETE('F.onLocate', 'Rename "F.onLocate" method for "F.onLocale".');
+		this.onLocale = value;
+	}
+}
+
+Framework.prototype.__proto__ = Object.create(events.EventEmitter.prototype, {
+	constructor: {
+		value: WebSocket,
+		enumberable: false
+	}
+});
+
 
 /**
  * Internal function
@@ -3869,7 +3885,8 @@ Framework.prototype.onAuthorize = null;
 	@res {Response} OR {WebSocketClient}
 	@return {String}
 */
-Framework.prototype.onLocate = null;
+Framework.prototype.onLocale = null;
+// OLD: Framework.prototype.onLocate = null;
 
 /**
  * Sets theme to controlller
@@ -6523,8 +6540,8 @@ Framework.prototype.listener = function(req, res) {
 		}
 	}
 
-	if (can && self.onLocate)
-		req.$language = self.onLocate(req, res, req.isStaticFile);
+	if (can && self.onLocale)
+		req.$language = self.onLocale(req, res, req.isStaticFile);
 
 	self._request_stats(true, true);
 
@@ -6955,8 +6972,8 @@ Framework.prototype._upgrade = function(req, socket, head) {
 	req.path = framework_internal.routeSplit(req.uri.pathname);
 	req.websocket = websocket;
 
-	if (self.onLocate)
-		req.$language = self.onLocate(req, socket);
+	if (self.onLocale)
+		req.$language = self.onLocale(req, socket);
 
 	if (self._length_request_middleware && !req.behaviour('disable-middleware'))
 		async_middleware(0, req, req.websocket, self.routes.request, () => self._upgrade_prepare(req, path, req.headers));
diff --git a/test/test-framework-debug.js b/test/test-framework-debug.js
@@ -15,7 +15,7 @@ framework.onCompileView = function(name, html, model) {
 	return html + 'COMPILED';
 };
 
-framework.onLocate = function(req) {
+framework.onLocale = function(req) {
 	return !req.url.startsWith('/abc') ? 'sk' : '';
 };
 
diff --git a/test/test-framework-release.js b/test/test-framework-release.js
@@ -15,7 +15,7 @@ framework.onCompileView = function(name, html, model) {
 	return html + 'COMPILED';
 };
 
-framework.onLocate = function(req) {
+framework.onLocale = function(req) {
 	return !req.url.startsWith('/abc') ? 'sk' : '';
 };
 
