codeecho
diff --git a/‎README.md
Copy file name to clipboardExpand all lines: README.md
+2Lines changed: 2 additions & 0 deletions b/‎README.md
Copy file name to clipboardExpand all lines: README.md
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎index.html
Copy file name to clipboardExpand all lines: index.html
+5-2Lines changed: 5 additions & 2 deletions b/‎index.html
Copy file name to clipboardExpand all lines: index.html
+5-2Lines changed: 5 additions & 2 deletions
diff --git a/‎js/example.js
Copy file name to clipboardExpand all lines: js/example.js
+22-3Lines changed: 22 additions & 3 deletions b/‎js/example.js
Copy file name to clipboardExpand all lines: js/example.js
+22-3Lines changed: 22 additions & 3 deletions
diff --git a/‎js/killring.js
Copy file name to clipboardExpand all lines: js/killring.js
+51-25Lines changed: 51 additions & 25 deletions b/‎js/killring.js
Copy file name to clipboardExpand all lines: js/killring.js
+51-25Lines changed: 51 additions & 25 deletions
@@ -28,6 +28,8 @@ josh.js is licensed under the Apache 2.0 License
 * Readline has not been tested with non-ascii.
 * [Readline Issues/Omissions](https://github.com/sdether/josh.js/issues/1)
 
+## Known Issues without 
+
 ## Usage
 
 Until documentation is written, refer to `index.html` and `example.js` for a sample implementation of a shell with path completion.
 
@@ -18,17 +18,20 @@
         #shell-panel {
             display: none;
             height: 400px;
-            width: 100%;
+            width: 97.0%;
             opacity: 0.9;
             background-color: #002f05;
             color: #00fe00;
             position: fixed;
             padding: 20px 20px 20px 20px;
             top: 0;
+            left: 0;
             z-index: 1000;
             font-family: 'Source Code Pro', sans-serif;
             font-size: 0.9em;
-            overflow: hidden;
+            overflow:scroll;
+            overflow-x:hidden;
+            overflow-y: scroll;
         }</style>
 </head>
 <body>
 
@@ -128,7 +128,25 @@
     );
     root.path = '/';
     var history = Josh.History();
-    var shell = Josh.Shell({history: history, console: _console});
+    var killring = new Josh.KillRing();
+    var readline = new Josh.ReadLine({history: history, killring: killring, console: _console });
+    var shell = Josh.Shell({readline: readline, history: history, console: _console});
+    var killringItemTemplate = _.template("<div><%- i %>&nbsp;<%- cmd %></div>");
+
+    shell.setCommandHandler("killring", {
+      exec: function(cmd, args, callback) {
+        if(args[0] == "-c") {
+          killring.clear();
+          callback();
+          return;
+        }
+        var content = $('<div></div>');
+        _.each(killring.items(), function(cmd, i) {
+          content.append(killringItemTemplate({cmd: cmd, i: i}));
+        });
+        callback(content);
+      }
+    });
     var pathhandler = Josh.PathHandler(shell, {console: _console});
     pathhandler.current = root;
     pathhandler.getNode = function(path, callback) {
@@ -167,10 +185,11 @@
         hideConsole();
       });
     });
-    return {
+    Josh.Instance = {
       Tree: root,
       Shell: shell,
-      PathHandler: pathhandler
+      PathHandler: pathhandler,
+      KillRing: killring
     };
   })(root, $, _);
 })(this, $, _);
@@ -15,62 +15,88 @@
  *-------------------------------------------------------------------------*/
 
 var Josh = Josh || {};
-(function (root) {
-  Josh.KillRing = function (config) {
+(function(root) {
+  Josh.KillRing = function(config) {
     config = config || {};
 
-    var _console = Josh.Debug && root.console ? root.console : {log:function () {
+    var _console = Josh.Debug && root.console ? root.console : {log: function() {
     }};
     var _ring = config.ring || [];
     var _cursor = config.cursor || 0;
-    var _current = '';
+    var _uncommitted = false;
     var _yanking = false;
-    if (_ring.length == 0) {
+    if(_ring.length == 0) {
       _cursor = -1;
-    } else if (_cursor >= _ring.length) {
+    } else if(_cursor >= _ring.length) {
       _cursor = _ring.length - 1;
     }
     var self = {
-      append:function (value) {
-        _yanking = false;
-        if (!value) {
-          return;
+      isinkill: function() {
+        return _uncommitted;
+      },
+      lastyanklength: function() {
+        if(!_yanking) {
+          return 0;
         }
-        _current += value;
+        return _ring[_cursor].length;
       },
-      prepend:function (value) {
+      append: function(value) {
         _yanking = false;
-        if (!value) {
+        if(!value) {
           return;
         }
-        _current = value + _current;
+        if(_ring.length == 0 || !_uncommitted) {
+          _ring.push('');
+        }
+        _cursor = _ring.length - 1;
+        _console.log("appending: " + value);
+        _uncommitted = true;
+        _ring[_cursor] += value;
       },
-      commit:function () {
+      prepend: function(value) {
         _yanking = false;
-        if (!_current) {
+        if(!value) {
           return;
         }
-        _ring.push(_current);
+        if(_ring.length == 0 || !_uncommitted) {
+          _ring.push('');
+        }
         _cursor = _ring.length - 1;
-        _current = '';
+        _console.log("prepending: " + value);
+        _uncommitted = true;
+        _ring[_cursor] = value + _ring[_cursor];
       },
-      yank:function () {
+      commit: function() {
+        _console.log("committing");
+        _yanking = false;
+        _uncommitted = false;
+      },
+      yank: function() {
         self.commit();
-        if (_ring.length == 0) {
-          return;
+        if(_ring.length == 0) {
+          return null;
         }
         _yanking = true;
         return _ring[_cursor];
       },
-      rotate:function () {
-        if (!_yanking || _ring.length == 0) {
-          return;
+      rotate: function() {
+        if(!_yanking || _ring.length == 0) {
+          return null;
         }
         --_cursor;
-        if (_cursor < 0) {
+        if(_cursor < 0) {
           _cursor = _ring.length - 1;
         }
         return self.yank();
+      },
+      items: function() {
+        return _ring.slice(0);
+      },
+      clear: function() {
+        _ring = [];
+        _cursor = -1;
+        _yanking = false;
+        _uncommited = false;
       }
     };
     return self;