Bump version to 0.17

README.md

@@ -17,5 +17,5 @@ all code is your original work.
 
 ## License
 
-Copyright (c) 2014, sourceLair, Limited (www.sourcelair.com) (MIT License)
+Copyright (c) 2014, SourceLair, Limited (www.sourcelair.com) (MIT License)
 Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)

addons/attach/attach.js

@@ -5,19 +5,34 @@
  * 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) {
-  var term = this;
-  
-  bidirectional = (typeof bidirectional == 'undefined') ? true : bidirectional;
-  this.socket = socket;
-  
-  socket.addEventListener('message', function (ev) {
-    term.write(ev.data);
-  });
-  
-  if (bidirectional) {
-    this.on('data', function (data) {
-      socket.send(data);
-    });
-  }
-}
+
+(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;
+      this.socket = socket;
+
+      socket.addEventListener('message', function (ev) {
+        term.write(ev.data);
+      });
+
+      if (bidirectional) {
+        this.on('data', function (data) {
+          socket.send(data);
+        });
+      }
+    };
+});

addons/fit/fit.js

@@ -11,19 +11,49 @@
  *               terminal row and truncate its width with the current number
  *               of columns)
  */
-Terminal.prototype.fit = function () {
-  var container = this.rowContainer,
-      subjectRow = this.rowContainer.firstElementChild,
-      rows = parseInt(container.offsetHeight / subjectRow.offsetHeight),
-      characterWidth,
-      cols;
-  
-  subjectRow.style.display = 'inline';
-  characterWidth = parseInt(subjectRow.offsetWidth / this.cols);
-  subjectRow.style.display = '';
-  
-  cols = container.offsetWidth / characterWidth;
-  cols = parseInt(cols);
-      
-  this.resize(cols, rows);
-};
+(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,
+          contentBuffer,
+          characterWidth,
+          cols;
+
+      subjectRow.style.display = 'inline';
+
+      contentBuffer = subjectRow.textContent;
+
+      subjectRow.innerHTML = ' '; /* Arbitrary character to calculate its dimensions */
+      characterWidth = parseInt(subjectRow.offsetWidth);
+      characterHeight = parseInt(subjectRow.offsetHeight);
+
+      subjectRow.style.display = '';
+
+      cols = container.offsetWidth / characterWidth;
+      cols = parseInt(cols);
+
+      var parentElementStyle = window.getComputedStyle(this.element.parentElement),
+          parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height')),
+          elementStyle = window.getComputedStyle(this.element),
+          elementPadding = parseInt(elementStyle.getPropertyValue('padding-top')) + parseInt(elementStyle.getPropertyValue('padding-bottom')),
+          availableHeight = parentElementHeight - elementPadding,
+          rowHeight = this.rowContainer.firstElementChild.offsetHeight;
+
+      rows = parseInt(availableHeight / rowHeight);
+
+      this.resize(cols, rows);
+    };
+});

addons/fullscreen/fullscreen.js

@@ -10,16 +10,30 @@
  * If the `fullscreen` argument has not been supplied, the
  * fullscreen mode is being toggled.
  */
-Terminal.prototype.toggleFullscreen = function (fullscreen) {
-  var fn;
-  
-  if (typeof fullscreen == 'undefined') {
-    fn = (this.element.classList.contains('fullscreen')) ? 'remove' : 'add';
-  } else if (!fullscreen) {
-    fn = 'remove';
-  } else {
-    fn = 'add';
-  }
-  
-  this.element.classList[fn]('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') {
+        fn = (this.element.classList.contains('fullscreen')) ? 'remove' : 'add';
+      } else if (!fullscreen) {
+        fn = 'remove';
+      } else {
+        fn = 'add';
+      }
+
+      this.element.classList[fn]('fullscreen');
+    };
+});

bower.json

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

demo/index.html

@@ -3,7 +3,7 @@
     <head>
         <title>xterm.js demo</title>
         <link rel="stylesheet" href="../src/xterm.css" />
-        <link rel="stylesheet" href="../addon/fullscreen/fullscreen.css" />
+        <link rel="stylesheet" href="../addons/fullscreen/fullscreen.css" />
         <link rel="stylesheet" href="style.css" />
         <script src="../src/xterm.js" ></script>
         <script src="../addons/fit/fit.js" ></script>

docs/conf.py

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