[fit addon] Restore row content after proposing geometry

- Restore `subjectRow.innerHTML`, using the `contentBuffer`
- Bump version to 0.25

addons/fit/fit.js

@@ -24,7 +24,7 @@
         fit(this.Xterm);
     }
 })(function (Xterm) {
-    Xterm.prototype.fit = function () {
+    Xterm.prototype.proposeGeometry = function () {
         var container = this.rowContainer,
             subjectRow = this.rowContainer.firstElementChild,
             rows,
@@ -34,7 +34,7 @@
 
         subjectRow.style.display = 'inline';
 
-      contentBuffer = subjectRow.textContent;
+        contentBuffer = subjectRow.innerHTML;
 
         subjectRow.innerHTML = ' '; /* Arbitrary character to calculate its dimensions */
         characterWidth = parseInt(subjectRow.offsetWidth);
@@ -54,6 +54,19 @@
 
         rows = parseInt(availableHeight / rowHeight);
         
-      this.resize(cols, rows);
+        subjectRow.innerHTML = contentBuffer; /* Replace original content */
+        
+        var geometry = {
+                'cols': cols,
+                'rows': rows
+            };
+
+        return geometry;
+    };
+
+    Xterm.prototype.fit = function () {
+        var geometry = this.proposeGeometry();
+
+        this.resize(geometry.cols, geometry.rows);
     };
 });

bower.json

@@ -1,5 +1,5 @@
 {
   "name": "xterm.js",
-  "version": "0.22",
+  "version": "0.25",
   "ignore": ["demo", "docs", "test", ".gitignore"]
 }

demo/main.js

@@ -1,12 +1,13 @@
 var terminalContainer = document.getElementById('terminal-container'),
-    term = new Terminal();
+    term = new Terminal(),
+    prompt = '> ';
 
 term.open(terminalContainer);
 term.fit();
 
 term.prompt = function () {
-  term.write('\r\n> ');
+  term.write('\r\n' + prompt);
-}
+};
 
 term.writeln('Welcome to xterm.js');
 term.writeln('Just type some keys in the prompt below.');
@@ -19,7 +20,12 @@ term.on('key', function (key, ev) {
   if (ev.keyIdentifier == 'Enter') {
     term.prompt();
   } else if (ev.keyCode == 8) {
+    /*
+     * Do not delete the prompt
+     */
+    if (term.x > 2) {
       term.write('\b \b');
+    }
   } else if (printable) {
     term.write(key);
   }

docs/conf.py

@@ -51,9 +51,9 @@ copyright = u'2014, SourceLair Limited'
 # built documents.
 #
 # The short X.Y version.
-version = '0.22'
+version = '0.25'
 # The full version, including alpha/beta/rc tags.
-release = '0.22 Alpha'
+release = '0.25 Alpha'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

src/xterm.js

@@ -36,7 +36,7 @@
         /*
          * Require.js is available
          */
-        define([], xterm);
+        define([], xterm.bind(window));
     } else {
         /*
          * Plain browser environment