Bump version to 0.17

addons/attach/attach.js

@@ -5,7 +5,21 @@
  * The bidirectional argument indicates, whether the terminal should
  * send data to the socket as well and is true, by default.
  */
-Terminal.prototype.attach = function (socket, bidirectional) {
+
+(function (attach) {
+    if (typeof define == 'function') {
+        /*
+         * Require.js is available
+         */
+        define(['../../src/xterm'], attach);
+    } else {
+        /*
+         * Plain browser environment
+         */ 
+        attach(this.Xterm);
+    }
+})(function (Xterm) {
+    Xterm.prototype.attach = function (socket, bidirectional) {
       var term = this;
 
       bidirectional = (typeof bidirectional == 'undefined') ? true : bidirectional;
@@ -20,4 +34,5 @@ Terminal.prototype.attach = function (socket, bidirectional) {
           socket.send(data);
         });
       }
-}
+    };
+});

addons/fit/fit.js

@@ -11,7 +11,20 @@
  *               terminal row and truncate its width with the current number
  *               of columns)
  */
-Terminal.prototype.fit = function () {
+(function (fit) {
+    if (typeof define == 'function') {
+        /*
+         * Require.js is available
+         */
+        define(['../../src/xterm'], fit);
+    } else {
+        /*
+         * Plain browser environment
+         */ 
+        fit(this.Xterm);
+    }
+})(function (Xterm) {
+    Xterm.prototype.fit = function () {
       var container = this.rowContainer,
           subjectRow = this.rowContainer.firstElementChild,
           rows,
@@ -43,3 +56,4 @@ Terminal.prototype.fit = function () {
 
       this.resize(cols, rows);
     };
+});

addons/fullscreen/fullscreen.js

@@ -10,7 +10,20 @@
  * If the `fullscreen` argument has not been supplied, the
  * fullscreen mode is being toggled.
  */
-Terminal.prototype.toggleFullscreen = function (fullscreen) {
+(function (fullscreen) {
+    if (typeof define == 'function') {
+        /*
+         * Require.js is available
+         */
+        define(['../../src/xterm'], fullscreen);
+    } else {
+        /*
+         * Plain browser environment
+         */ 
+        fullscreen(this.Xterm);
+    }
+})(function (Xterm) {
+    Xterm.prototype.toggleFullscreen = function (fullscreen) {
       var fn;
 
       if (typeof fullscreen == 'undefined') {
@@ -22,4 +35,5 @@ Terminal.prototype.toggleFullscreen = function (fullscreen) {
       }
 
       this.element.classList[fn]('fullscreen');
-}
+    };
+});

bower.json

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

docs/conf.py

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

src/xterm.js

@@ -31,8 +31,20 @@
  *   other features.
  */
 
-;(function() {
+(function (xterm) {
-
+    if (typeof define == 'function') {
+        /*
+         * Require.js is available
+         */
+        define([], xterm);
+    } else {
+        /*
+         * Plain browser environment
+         */ 
+        this.Xterm = xterm.call(this);
+        this.Terminal = this.Xterm; /* Backwards compatibility with term.js */
+    }
+})(function() {
     /**
      * Terminal Emulation References:
      *   http://vt100.net/
@@ -50,8 +62,7 @@
      * Shared
      */
 
-var window = this
+    var window = this, document = this.document;
-  , document = this.document;
 
     /**
      * EventEmitter
@@ -4763,12 +4774,5 @@ Terminal.on = on;
     Terminal.off = off;
     Terminal.cancel = cancel;
 
-if (typeof module !== 'undefined') {
+    return Terminal;
-  module.exports = Terminal;
+});
-} else {
-  this.Terminal = Terminal;
-}
-
-}).call(function() {
-  return this || (typeof window !== 'undefined' ? window : global);
-}());