Skip to content

D3 loaded by amd and commonjs #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kimxogus wants to merge 2 commits into
base: master
Choose a base branch
from
Open

D3 loaded by amd and commonjs #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
149445e
require d3 from different sources
kimxogus Nov 4, 2016
908d443
build
kimxogus Nov 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion d3pie-source/_validate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var validate = {
var options = pie.options;

// confirm d3 is available [check minimum version]
if (!window.d3 || !window.d3.hasOwnProperty("version")) {
if (!d3 || !d3.hasOwnProperty("version")) {
console.error("d3pie error: d3 is not available");
return false;
}
Expand Down
16 changes: 12 additions & 4 deletions d3pie-source/d3pie-source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,24 @@
(function(root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module
define([], factory);
var d3;
try {
d3 = require('d3');
} catch (e) {
d3 = root.d3;
}
define([], function() {
return factory(d3);
});
} else if (typeof exports === 'object') {
// Node. Does not work with strict CommonJS, but only CommonJS-like environments that support module.exports,
// like Node
module.exports = factory();
module.exports = factory(require('d3'));
} else {
// browser globals (root is window)
root.d3pie = factory(root);
root.d3pie = factory(root.d3);
}
}(this, function() {
}(this, function(d3) {

var _scriptName = "d3pie";
var _version = "0.1.6";
Expand Down
18 changes: 13 additions & 5 deletions d3pie/d3pie.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,24 @@
(function(root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module
define([], factory);
var d3;
try {
d3 = require('d3');
} catch (e) {
d3 = root.d3;
}
define([], function() {
return factory(d3);
});
} else if (typeof exports === 'object') {
// Node. Does not work with strict CommonJS, but only CommonJS-like environments that support module.exports,
// like Node
module.exports = factory();
module.exports = factory(require('d3'));
} else {
// browser globals (root is window)
root.d3pie = factory(root);
root.d3pie = factory(root.d3);
}
}(this, function() {
}(this, function(d3) {

var _scriptName = "d3pie";
var _version = "0.1.6";
Expand Down Expand Up @@ -195,7 +203,7 @@ var validate = {
var options = pie.options;

// confirm d3 is available [check minimum version]
if (!window.d3 || !window.d3.hasOwnProperty("version")) {
if (!d3 || !d3.hasOwnProperty("version")) {
console.error("d3pie error: d3 is not available");
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions d3pie/d3pie.min.js
View file
Open in desktop

Large diffs are not rendered by default.