mirror/html2canvas
1
0
Fork 0
mirror of https://github.com/niklasvh/html2canvas.git synced 2023-08-10 21:13:10 +03:00
Code Issues Projects Releases Wiki Activity

Fix support for requirejs/amd

Browse Source
This commit is contained in:
Niklas von Hertzen 2015-08-30 02:27:38 +03:00
parent 98ee30643a
commit 4b37909f09
6 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.jshintrc
View File

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

10
dist/html2canvas.js vendored
View File

@ -1978,10 +1978,18 @@ html2canvas.NodeContainer = NodeContainer;
html2canvas.log = log;
html2canvas.utils = utils;
module.exports = (typeof(document) === "undefined" || typeof(Object.create) !== "function" || typeof(document.createElement("canvas").getContext) !== "function") ? function() {
var html2canvasExport = (typeof(document) === "undefined" || typeof(Object.create) !== "function" || typeof(document.createElement("canvas").getContext) !== "function") ? function() {
return Promise.reject("No canvas support");
} : html2canvas;
module.exports = html2canvasExport;
if (typeof(define) === 'function' && define.amd) {
define('html2canvas', [], function() {
return html2canvasExport;
});
}
function renderDocument(document, options, windowWidth, windowHeight, html2canvasIndex) {
return createWindowClone(document, document, windowWidth, windowHeight, options, document.defaultView.pageXOffset, document.defaultView.pageYOffset).then(function(container) {
log("Document cloned");

6
dist/html2canvas.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
package.json
View File

@ -39,6 +39,7 @@
"humanize-duration": "^2.0.1",
"lodash": "^2.4.1",
"png-js": ">= 0.1.1",
"requirejs": "^2.1.20",
"wd": "^0.2.21"
},
"scripts": {

10
src/core.js
View File

@ -57,10 +57,18 @@ html2canvas.NodeContainer = NodeContainer;
html2canvas.log = log;
html2canvas.utils = utils;
module.exports = (typeof(document) === "undefined" || typeof(Object.create) !== "function" || typeof(document.createElement("canvas").getContext) !== "function") ? function() {
var html2canvasExport = (typeof(document) === "undefined" || typeof(Object.create) !== "function" || typeof(document.createElement("canvas").getContext) !== "function") ? function() {
return Promise.reject("No canvas support");
} : html2canvas;
module.exports = html2canvasExport;
if (typeof(define) === 'function' && define.amd) {
define('html2canvas', [], function() {
return html2canvasExport;
});
}
function renderDocument(document, options, windowWidth, windowHeight, html2canvasIndex) {
return createWindowClone(document, document, windowWidth, windowHeight, options, document.defaultView.pageXOffset, document.defaultView.pageYOffset).then(function(container) {
log("Document cloned");

16
tests/node/package.js
View File

@ -1,4 +1,5 @@
var assert = require('assert');
var path = require('path');
var html2canvas = require('../../');
describe("Package", function() {
@ -6,3 +7,18 @@ describe("Package", function() {
assert.equal(typeof(html2canvas), "function");
});
});
describe.only("requirejs", function() {
var requirejs = require('requirejs');
requirejs.config({
baseUrl: path.resolve(__dirname, '../../dist')
});
it("should have html2canvas defined", function(done) {
requirejs(['html2canvas'], function(h2c) {
assert.equal(typeof(h2c), "function");
done();
});
});
});