Merge pull request #535 from Tyriar/534_phantomjs

[mirror_xterm.js.git] / src / xterm.js

diff --git a/src/xterm.js b/src/xterm.js
index 664d18126f61949aa91fe0ba845eb59c09980a9c..f76c01b5941482833ad7e2d58849d12ddeabbee2 100644 (file)
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -1715,6 +1715,10 @@ Terminal.prototype.error = function() {
  * @param {number} y The number of rows to resize to.
  */
 Terminal.prototype.resize = function(x, y) {
+  if (isNaN(x) || isNaN(y)) {
+    return;
+  }
+
   var line
   , el
   , i
@@ -2233,6 +2237,9 @@ function keys(obj) {
 Terminal.EventEmitter = EventEmitter;
 Terminal.inherits = inherits;
 
+// Expose for Phantom.JS tests
+Terminal.CharMeasure = CharMeasure;
+
 /**
  * Adds an event listener to the terminal.
  *