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 b27406830fe2393bc7063f3442f98f0f89177060..f76c01b5941482833ad7e2d58849d12ddeabbee2 100644 (file)
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -1715,7 +1715,7 @@ Terminal.prototype.error = function() {
  * @param {number} y The number of rows to resize to.
  */
 Terminal.prototype.resize = function(x, y) {
-  if (Number.isNaN(x) || Number.isNaN(y)) {
+  if (isNaN(x) || isNaN(y)) {
     return;
   }
 
@@ -2237,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.
  *