- Cleanup directory.

- Used new node_modules folder - Runtime set NODE_PATH path to current script
uocnb · Aug 25, 2012 · 136eb67 · 136eb67
1 parent 4310b26
commit 136eb67
Show file tree

Hide file tree

Showing 32 changed files with 16 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,5 +16,5 @@ TermKit.app
 *.perspectivev3
 
 # modules managed by npm
-node_modules
+/node_modules
 
diff --git a/HTML/Shared b/HTML/Shared
diff --git a/HTML/client/client.js b/HTML/client/client.js
@@ -13,9 +13,7 @@ var tc = termkit.client = function () {
   this.onDisconnect = function () {};
 
   // Set up socket with back-end.
-  // var s = this.socket = new io.Socket({host: 'localhost', port: 2222 }); 
   var s = this.socket = io.connect('http://localhost:2222'); 
-  // var s = this.socket = new io.Socket(); 
 
   // Use shared protocol handler with back-end.
   this.protocol = new termkit.protocol(this.socket, this);
@@ -26,9 +24,6 @@ var tc = termkit.client = function () {
   s.on('disconnect', function() {
     that.onDisconnect();
   }); 
-
-  // Open connection.
-  // s.connect();
 };
 
 tc.prototype = {

diff --git a/HTML/external/syntaxhighlighter_3.0.83/tests/commonjs_tests.js b/HTML/external/syntaxhighlighter_3.0.83/tests/commonjs_tests.js
@@ -1,8 +1,6 @@
 /**
  * This is a CommonJS compatibility test. You can run this file with node.
  */
-require.paths.unshift(__dirname + '/../scripts');
-
 var sys = require('sys'),
 	shSyntaxHighlighter = require('shCore').SyntaxHighlighter,
 	code = 'test',

diff --git a/HTML/index.html b/HTML/index.html
@@ -11,7 +11,7 @@
 
   <script type="text/javascript" charset="utf-8" src="container.js"></script>
 
-  <script type="text/javascript" charset="utf-8" src="Shared/protocol.js"></script>
+  <script type="text/javascript" charset="utf-8" src="protocol.js"></script>
   <script type="text/javascript" charset="utf-8" src="client/client.js"></script>
   <script type="text/javascript" charset="utf-8" src="client/shell.js"></script>
 

diff --git a/HTML/protocol.js b/HTML/protocol.js
@@ -0,0 +1 @@
+../Node/node_modules/protocol.js
diff --git a/HTML/termkit.js b/HTML/termkit.js
@@ -7,8 +7,6 @@ var termkit = window.termkit || {};
 $(document).ready(function () {
 
   var client = new termkit.client();
-  window.tc = client;
-  window.s = client.protocol.connection;
   client.onConnect = function () {
     var shell = new termkit.client.shell(client, {}, function (shell) {
       var view = new termkit.commandView(shell);

diff --git a/Node/config.js → Node/node_modules/config.js b/Node/config.js → Node/node_modules/config.js
diff --git a/Node/misc.js → Node/node_modules/misc.js b/Node/misc.js → Node/node_modules/misc.js
diff --git a/Shared/protocol.js → Node/node_modules/protocol.js b/Shared/protocol.js → Node/node_modules/protocol.js
diff --git a/Node/router.js → Node/node_modules/router.js b/Node/router.js → Node/node_modules/router.js
diff --git a/Node/shell/autocomplete.js → Node/node_modules/shell/autocomplete.js b/Node/shell/autocomplete.js → Node/node_modules/shell/autocomplete.js
diff --git a/Node/shell/builtin/builtin.js → Node/node_modules/shell/builtin/builtin.js b/Node/shell/builtin/builtin.js → Node/node_modules/shell/builtin/builtin.js
diff --git a/Node/shell/builtin/cat.js → Node/node_modules/shell/builtin/cat.js b/Node/shell/builtin/cat.js → Node/node_modules/shell/builtin/cat.js
diff --git a/Node/shell/builtin/cd.js → Node/node_modules/shell/builtin/cd.js b/Node/shell/builtin/cd.js → Node/node_modules/shell/builtin/cd.js
diff --git a/Node/shell/builtin/echo.js → Node/node_modules/shell/builtin/echo.js b/Node/shell/builtin/echo.js → Node/node_modules/shell/builtin/echo.js
diff --git a/Node/shell/builtin/grep.js → Node/node_modules/shell/builtin/grep.js b/Node/shell/builtin/grep.js → Node/node_modules/shell/builtin/grep.js
diff --git a/Node/shell/builtin/ls.js → Node/node_modules/shell/builtin/ls.js b/Node/shell/builtin/ls.js → Node/node_modules/shell/builtin/ls.js
diff --git a/Node/shell/builtin/null.js → Node/node_modules/shell/builtin/null.js b/Node/shell/builtin/null.js → Node/node_modules/shell/builtin/null.js
diff --git a/Node/shell/builtin/pwd.js → Node/node_modules/shell/builtin/pwd.js b/Node/shell/builtin/pwd.js → Node/node_modules/shell/builtin/pwd.js
diff --git a/Node/shell/command.js → Node/node_modules/shell/command.js b/Node/shell/command.js → Node/node_modules/shell/command.js
diff --git a/Node/shell/formatter.js → Node/node_modules/shell/formatter.js b/Node/shell/formatter.js → Node/node_modules/shell/formatter.js
diff --git a/Node/shell/meta.js → Node/node_modules/shell/meta.js b/Node/shell/meta.js → Node/node_modules/shell/meta.js
diff --git a/Node/shell/processor.js → Node/node_modules/shell/processor.js b/Node/shell/processor.js → Node/node_modules/shell/processor.js
diff --git a/Node/shell/reader.js → Node/node_modules/shell/reader.js b/Node/shell/reader.js → Node/node_modules/shell/reader.js
diff --git a/Node/shell/shell.js → Node/node_modules/shell/shell.js b/Node/shell/shell.js → Node/node_modules/shell/shell.js
diff --git a/Node/shell/worker.js → Node/node_modules/shell/worker.js b/Node/shell/worker.js → Node/node_modules/shell/worker.js
diff --git a/Node/test.js → Node/node_modules/test.js b/Node/test.js → Node/node_modules/test.js
diff --git a/Node/view/view.js → Node/node_modules/view/view.js b/Node/view/view.js → Node/node_modules/view/view.js
diff --git a/Node/nodekit.js b/Node/nodekit.js
@@ -2,14 +2,15 @@
 var termkit = {
   version: 1,
 };
-//require.paths.unshift(__dirname);
-//require.paths.unshift(__dirname+'/../Shared');
-require(__dirname+'/../Shared/protocol');
+
+process.env['NODE_PATH'] = __dirname;
+
+require('protocol');
 
 // Load requirements.
 var http = require('http'),  
     io = require('socket.io')
-    router = require("router"),
+    router = require('router'),
     connect = require('connect');
 
 // Load config file.

diff --git a/Node/socket.io-node b/Node/socket.io-node
diff --git a/package.json b/package.json
@@ -3,10 +3,10 @@
   "name": "termkit",
   "description": "a nextgen shellish webapp",
   "version": "0.0.0",
-  "homepage": "http://github.com/floby/TermKit",
+  "homepage": "http://github.com/tiger2wander/TermKit",
   "repository": {
     "type": "git",
-    "url": "git://github.com/Floby/TermKit.git"
+    "url": "git://github.com/tiger2wander/TermKit.git"
   },
   "main": "Node/nodekit.js",
   "engines": {