Page MenuHomePhabricator
Files F15409010

D11425.id27459.diff
No OneTemporary
Actions

D11425.id27459.diff
View Options

diff --git a/support/aphlict/server/aphlict_server.js b/support/aphlict/server/aphlict_server.js
--- a/support/aphlict/server/aphlict_server.js
+++ b/support/aphlict/server/aphlict_server.js
@@ -4,8 +4,9 @@
var util = require('util');
var fs = require('fs');
-JX.require('lib/AphlictListenerList', __dirname);
-JX.require('lib/AphlictLog', __dirname);
+require('./lib/AphlictLog');
+require('./lib/AphlictAdminServer');
+require('./lib/AphlictClientServer');
function parse_command_line_arguments(argv) {
var config = {
@@ -96,9 +97,6 @@
process.exit(0);
}
-JX.require('lib/AphlictAdminServer', __dirname);
-JX.require('lib/AphlictClientServer', __dirname);
-
var server;
if (ssl_config.enabled) {
server = https.createServer({
diff --git a/support/aphlict/server/lib/AphlictAdminServer.js b/support/aphlict/server/lib/AphlictAdminServer.js
--- a/support/aphlict/server/lib/AphlictAdminServer.js
+++ b/support/aphlict/server/lib/AphlictAdminServer.js
@@ -1,6 +1,6 @@
-var JX = require('javelin').JX;
+var JX = require('./javelin').JX;
-JX.require('AphlictListenerList', __dirname);
+require('./AphlictListenerList');
var http = require('http');
diff --git a/support/aphlict/server/lib/AphlictClientServer.js b/support/aphlict/server/lib/AphlictClientServer.js
--- a/support/aphlict/server/lib/AphlictClientServer.js
+++ b/support/aphlict/server/lib/AphlictClientServer.js
@@ -1,7 +1,7 @@
-var JX = require('javelin').JX;
+var JX = require('./javelin').JX;
-JX.require('AphlictListenerList', __dirname);
-JX.require('AphlictLog', __dirname);
+require('./AphlictListenerList');
+require('./AphlictLog');
var util = require('util');
var WebSocket = require('ws');
diff --git a/support/aphlict/server/lib/AphlictListener.js b/support/aphlict/server/lib/AphlictListener.js
--- a/support/aphlict/server/lib/AphlictListener.js
+++ b/support/aphlict/server/lib/AphlictListener.js
@@ -1,4 +1,4 @@
-var JX = require('javelin').JX;
+var JX = require('./javelin').JX;
JX.install('AphlictListener', {
construct: function(id, socket) {
diff --git a/support/aphlict/server/lib/AphlictListenerList.js b/support/aphlict/server/lib/AphlictListenerList.js
--- a/support/aphlict/server/lib/AphlictListenerList.js
+++ b/support/aphlict/server/lib/AphlictListenerList.js
@@ -1,5 +1,6 @@
-var JX = require('javelin').JX;
-JX.require('AphlictListener', __dirname);
+var JX = require('./javelin').JX;
+
+require('./AphlictListener');
JX.install('AphlictListenerList', {
construct: function() {
diff --git a/support/aphlict/server/lib/AphlictLog.js b/support/aphlict/server/lib/AphlictLog.js
--- a/support/aphlict/server/lib/AphlictLog.js
+++ b/support/aphlict/server/lib/AphlictLog.js
@@ -1,4 +1,4 @@
-var JX = require('javelin').JX;
+var JX = require('./javelin').JX;
var fs = require('fs');
var util = require('util');
diff --git a/webroot/rsrc/externals/javelin/core/init_node.js b/webroot/rsrc/externals/javelin/core/init_node.js
--- a/webroot/rsrc/externals/javelin/core/init_node.js
+++ b/webroot/rsrc/externals/javelin/core/init_node.js
@@ -23,11 +23,10 @@
func();
};
-JX.require = function(thing, relative) {
- relative = relative || __dirname + '/..';
+JX.require = function(thing) {
+ var relative = __dirname + '/..';
var path = relative + '/' + thing + '.js';
var content = fs.readFileSync(path);
- var dir = pathModule.dirname(path);
var k;
var sandbox = {};
@@ -40,14 +39,6 @@
JX : this,
__DEV__ : 0,
window : {},
- __dirname : dir,
- require : function(thing) {
- if (thing == 'javelin') {
- return require(dir + '/' + thing);
- } else {
- return require(thing);
- }
- }
};
for (k in extra) {

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 20, 2:43 AM (5 d, 22 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7682184
Default Alt Text
D11425.id27459.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility