Merge pull request #703 from niklasvh/travis-fix

Lower travis nodejs version back to 0.10

.jshintrc

@@ -15,5 +15,5 @@
     "globals": {
       "jQuery": true
     },
-    "predef": ["-Promise", "define"]
+    "predef": ["Promise", "define"]
 }

.npmignore

@@ -3,3 +3,8 @@ examples/
 Gruntfile.js
 bower.json
 src/
+*.iml
+.idea/
+.npmignore
+.jshintrc
+.travis.yml

.travis.yml

@@ -22,7 +22,7 @@ deploy:
   - provider: npm
     email: niklasvh@gmail.com
     api_key:
-      secure: dot+HzIe3thKep5mz5pyNYQV1ZYiGlVQAWScmfYh75AtOCJQJGvvw1alwRZDL0Ykn/7LeftZik845INn8Al8h4OEUQyuq2WmybZ5zn7PsLXRes7FtlJeYERO79bV5P3aV4vq4QoaZkPB5jQ98CmgQ2/9xPB+1ogNd7fRfUpSvSI=
+      secure: G/Szpr8q4/D6hp+H/Z9yyluUXtHAwf7LLa1Y07X59/Enlj1h7V5fQ7AW4/iAVM3XbIsrCPWR3dJU9g/ZxpxFg4OovIHVpS2Jr/mahtPYWdHR3pWuSmMW8QD+Twnq2VAFwSgg5Oumq3QxhX3YbCOnZox6+6Uviqk8FO7Z5B0RwW4=
     on:
       tags: true
       branch: master

package.json

@@ -3,7 +3,7 @@
   "name": "html2canvas",
   "description": "Screenshots with JavaScript",
   "main": "dist/html2canvas.js",
-  "version": "0.5.0-beta1",
+  "version": "0.5.0-beta2",
   "author": {
     "name": "Niklas von Hertzen",
     "email": "niklasvh@gmail.com",
@@ -12,9 +12,6 @@
   "engines": {
     "node": ">=0.10.0"
   },
-  "dependencies": {
-    "es6-promise": "^2.0.1"
-  },
   "repository": {
     "type": "git",
     "url": "git@github.com:niklasvh/html2canvas.git"
@@ -23,9 +20,8 @@
     "url": "https://github.com/niklasvh/html2canvas/issues"
   },
   "devDependencies": {
-    "base64-arraybuffer": ">= 0.1.0",
-    "bluebird": "^2.7.1",
-    "bower": "^1.3.12",
+    "base64-arraybuffer": ">= 0.1.4",
+    "bluebird": "2.7.1",
     "grunt": "^0.4.5",
     "grunt-browserify": "^3.3.0",
     "grunt-contrib-connect": "^0.8.0",
@@ -43,8 +39,7 @@
     "wd": "^0.2.21"
   },
   "scripts": {
-    "test": "grunt travis --verbose",
-    "postpublish": "bower register html2canvas git://github.com/niklasvh/html2canvas.git"
+    "test": "grunt travis --verbose"
   },
   "homepage": "http://html2canvas.hertzen.com",
   "licenses": [

readme.md

@@ -20,7 +20,7 @@ The script is still in a **very experimental state**, so I don't recommend using
 
 ###Browser compatibility###
 
-The script should work fine on the following browsers:
+The library should work fine on the following browsers (with `Promise` polyfill):
 
 * Firefox 3.5+
 * Google Chrome
@@ -32,6 +32,10 @@ As each CSS property needs to be manually built to be supported, there are a num
 
 ### Usage ###
 
+The html2canvas library utilizes `Promise`s and expects them to be available in the global context. If you wish to
+support [older browsers](http://caniuse.com/#search=promise) that do not natively support `Promise`s, please include a polyfill such as
+[es6-promise](https://github.com/jakearchibald/es6-promise) before including `html2canvas`.
+
 **Note!** These instructions are for using the current dev version of 0.5, for the latest release version (0.4.1), checkout the [old readme](https://github.com/niklasvh/html2canvas/blob/v0.4/readme.md).
 
 To render an `element` with html2canvas, simply call:

src/clone.js

@@ -1,5 +1,4 @@
 var log = require('./log');
-var Promise = require('./promise');
 
 function restoreOwnerScroll(ownerDocument, x, y) {
     if (ownerDocument.defaultView && (x !== ownerDocument.defaultView.pageXOffset || y !== ownerDocument.defaultView.pageYOffset)) {

src/core.js

@@ -1,4 +1,3 @@
-var Promise = require('./promise');
 var Support = require('./support');
 var CanvasRenderer = require('./renderers/canvas');
 var ImageLoader = require('./imageloader');
@@ -51,7 +50,6 @@ function html2canvas(nodeList, options) {
     });
 }
 
-html2canvas.Promise = Promise;
 html2canvas.CanvasRenderer = CanvasRenderer;
 html2canvas.NodeContainer = NodeContainer;
 html2canvas.log = log;

src/dummyimagecontainer.js

@@ -1,4 +1,3 @@
-var Promise = require('./promise');
 var log = require('./log');
 var smallImage = require('./utils').smallImage;
 

src/framecontainer.js

@@ -1,5 +1,4 @@
 var utils = require('./utils');
-var Promise = require('./promise');
 var getBounds = utils.getBounds;
 var loadUrlDocument = require('./proxy').loadUrlDocument;
 

src/gradientcontainer.js

@@ -1,5 +1,3 @@
-var Promise = require('./promise');
-
 function GradientContainer(imageData) {
     this.src = imageData.value;
     this.colorStops = [];

src/imagecontainer.js

@@ -1,5 +1,3 @@
-var Promise = require('./promise');
-
 function ImageContainer(src, cors) {
     this.src = src;
     this.image = new Image();

src/imageloader.js

@@ -1,4 +1,3 @@
-var Promise = require('./promise');
 var log = require('./log');
 var ImageContainer = require('./imagecontainer');
 var DummyImageContainer = require('./dummyimagecontainer');

src/nodeparser.js

@@ -5,7 +5,6 @@ var TextContainer = require('./textcontainer');
 var PseudoElementContainer = require('./pseudoelementcontainer');
 var FontMetrics = require('./fontmetrics');
 var Color = require('./color');
-var Promise = require('./promise');
 var StackingContext = require('./stackingcontext');
 var utils = require('./utils');
 var bind = utils.bind;

src/promise.js

@@ -1 +0,0 @@
-module.exports = require('es6-promise').Promise;

src/proxy.js

@@ -1,4 +1,3 @@
-var Promise = require('./promise');
 var XHR = require('./xhr');
 var utils = require('./utils');
 var log = require('./log');

src/proxyimagecontainer.js

@@ -1,5 +1,4 @@
 var ProxyURL = require('./proxy').ProxyURL;
-var Promise = require('./promise');
 
 function ProxyImageContainer(src, proxy) {
     var link = document.createElement("a");

src/svgcontainer.js

@@ -1,4 +1,3 @@
-var Promise = require('./promise');
 var XHR = require('./xhr');
 var decode64 = require('./utils').decode64;
 

src/svgnodecontainer.js

@@ -1,5 +1,4 @@
 var SVGContainer = require('./svgcontainer');
-var Promise = require('./promise');
 
 function SVGNodeContainer(node, _native) {
     this.src = node;

src/xhr.js

@@ -1,5 +1,3 @@
-var Promise = require('./promise');
-
 function XHR(url) {
     return new Promise(function(resolve, reject) {
         var xhr = new XMLHttpRequest();

tests/mocha/background.html

@@ -3,6 +3,7 @@
     <meta charset="utf-8">
     <title>Mocha Tests</title>
     <link rel="stylesheet" href="lib/mocha.css" />
+    <script src="../../node_modules/bluebird/js/browser/bluebird.js"></script>
     <script src="../../dist/html2canvas.js"></script>
     <script src="../assets/jquery-1.6.2.js"></script>
     <script src="lib/expect.js"></script>

tests/mocha/cropping.html

@@ -3,6 +3,7 @@
     <meta charset="utf-8">
     <title>Mocha Tests</title>
     <link rel="stylesheet" href="lib/mocha.css" />
+    <script src="../../node_modules/bluebird/js/browser/bluebird.js"></script>
     <script src="../../dist/html2canvas.js"></script>
     <script src="../assets/jquery-1.6.2.js"></script>
     <script src="lib/expect.js"></script>

tests/mocha/form-rendering.html

@@ -3,6 +3,7 @@
     <meta charset="utf-8">
     <title>Mocha Tests</title>
     <link rel="stylesheet" href="lib/mocha.css" />
+    <script src="../../node_modules/bluebird/js/browser/bluebird.js"></script>
     <script src="../../dist/html2canvas.js"></script>
     <script src="../assets/jquery-1.6.2.js"></script>
     <script src="lib/expect.js"></script>

tests/mocha/ie9-clonenode-bug.html

@@ -4,6 +4,7 @@
     <meta charset="UTF-8">
     <title>Proxy tests</title>
     <link rel="stylesheet" href="lib/mocha.css" />
+    <script src="../../node_modules/bluebird/js/browser/bluebird.js"></script>
     <script src="../assets/jquery-1.6.2.js"></script>
     <script src="lib/expect.js"></script>
     <script src="lib/mocha.js"></script>

tests/mocha/multiple-renders.html

@@ -3,6 +3,7 @@
     <meta charset="utf-8">
     <title>Mocha Tests</title>
     <link rel="stylesheet" href="lib/mocha.css" />
+    <script src="../../node_modules/bluebird/js/browser/bluebird.js"></script>
     <script src="../../dist/html2canvas.js"></script>
     <script src="../assets/jquery-1.6.2.js"></script>
     <script src="lib/expect.js"></script>
@@ -25,7 +26,6 @@
 <div id="green-block"></div>
 <script>mocha.setup('bdd')</script>
 <script>
-    var Promise = html2canvas.Promise;
     describe("Multiple renders", function() {
         it("render correctly", function(done) {
             this.timeout(10000);

tests/mocha/options.onclone.html

@@ -3,6 +3,7 @@
     <meta charset="utf-8">
     <title>Mocha Tests</title>
     <link rel="stylesheet" href="lib/mocha.css" />
+    <script src="../../node_modules/bluebird/js/browser/bluebird.js"></script>
     <script src="../../dist/html2canvas.js"></script>
     <script src="../assets/jquery-1.6.2.js"></script>
     <script src="lib/expect.js"></script>
@@ -23,7 +24,6 @@
 <div style="background: red; width: 200px; height:200px;" id="block"></div>
 <div style="width: 200px; height:200px;" id="block2"></div>
 <script>
-    var Promise = html2canvas.Promise;
     describe("options.onclone", function() {
         it("with a function", function(done) {
             html2canvas(document.querySelector("#block"), {onclone: function(document) {

tests/mocha/scrolling.html

@@ -4,6 +4,7 @@
     <meta charset="UTF-8">
     <title>Scrolling tests</title>
     <link rel="stylesheet" href="lib/mocha.css" />
+    <script src="../../node_modules/bluebird/js/browser/bluebird.js"></script>
     <script src="../../dist/html2canvas.js"></script>
     <script src="../assets/jquery-1.6.2.js"></script>
     <script src="lib/expect.js"></script>

tests/test.js

@@ -4,10 +4,7 @@ var h2cSelector, h2cOptions;
         document.write('<script type="text/javascript" src="' + src + '.js?' + Math.random() + '"></script>');
     }
 
-    var sources = ['log', 'punycode/punycode', 'core', 'nodecontainer', 'pseudoelementcontainer', 'stackingcontext', 'textcontainer', 'support', 'imagecontainer', 'dummyimagecontainer', 'proxyimagecontainer', 'gradientcontainer',
-        'lineargradientcontainer', 'webkitgradientcontainer', 'svgcontainer', 'svgnodecontainer', 'imageloader', 'nodeparser', 'font', 'fontmetrics', 'renderer', 'promise', 'xhr', 'framecontainer', 'proxy', 'color', 'renderers/canvas'];
-
-    ['/tests/assets/jquery-1.6.2', '/dist/html2canvas'].forEach(appendScript);
+    ['/node_modules/bluebird/js/browser/bluebird', '/tests/assets/jquery-1.6.2', '/dist/html2canvas'].forEach(appendScript);
 
     if (typeof(noFabric) === "undefined") {
         appendScript('/dist/html2canvas.svg');