Page MenuHomePhabricator
Files F15397488

D11425.diff
No OneTemporary
Actions

D11425.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -167,7 +167,7 @@
'rsrc/externals/javelin/core/__tests__/stratcom.js' => '88bf7313',
'rsrc/externals/javelin/core/__tests__/util.js' => 'e251703d',
'rsrc/externals/javelin/core/init.js' => '76e1fd61',
- 'rsrc/externals/javelin/core/init_node.js' => 'd7dde471',
+ 'rsrc/externals/javelin/core/init_node.js' => '7212f324',
'rsrc/externals/javelin/core/install.js' => '05270951',
'rsrc/externals/javelin/core/util.js' => 'bdcfee9e',
'rsrc/externals/javelin/docs/Base.js' => '74676256',
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,9 +4,6 @@
var util = require('util');
var fs = require('fs');
-JX.require('lib/AphlictListenerList', __dirname);
-JX.require('lib/AphlictLog', __dirname);
-
function parse_command_line_arguments(argv) {
var config = {
'client-port': 22280,
@@ -37,6 +34,8 @@
return config;
}
+require('./lib/AphlictLog');
+
var debug = new JX.AphlictLog()
.addConsole(console);
@@ -71,6 +70,12 @@
'documentation for instructions. ' + ex.toString());
}
+// NOTE: Require these only after checking for the "ws" module, since they
+// depend on it.
+
+require('./lib/AphlictAdminServer');
+require('./lib/AphlictClientServer');
+
var ssl_config = {
enabled: (config['ssl-key'] || config['ssl-cert'])
};
@@ -94,9 +99,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,9 +23,8 @@
func();
};
-JX.require = function(thing, relative) {
- relative = relative || __dirname + '/..';
- var path = relative + '/' + thing + '.js';
+JX.require = function(thing) {
+ var path = __dirname + '/../' + thing + '.js';
var content = fs.readFileSync(path);
var dir = pathModule.dirname(path);
@@ -37,17 +36,10 @@
}
var extra = {
- JX : this,
- __DEV__ : 0,
- window : {},
- __dirname : dir,
- require : function(thing) {
- if (thing == 'javelin') {
- return require(dir + '/' + thing);
- } else {
- return require(thing);
- }
- }
+ JX: this,
+ __DEV__: 0,
+ window: {},
+ __dirname: dir
};
for (k in extra) {

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 17, 8:33 PM (3 d, 9 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7639222
Default Alt Text
D11425.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility