Skip to content
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.

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

Avoid conflicts with underscore #40

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }

var React = require('react');
var _ = require('lodash');
var _ = require('lodash').noConflict();

var QuestionPanel = require('./questionPanel');

Expand Down
2 changes: 1 addition & 1 deletion dist/lib/validation.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

var _ = require('lodash');
var _ = require('lodash').noConflict();
var Validator = require('validator');
var StringParser = require('./stringParser');

Expand Down
2 changes: 1 addition & 1 deletion dist/question.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }

var React = require('react');
var _ = require('lodash');
var _ = require('lodash').noConflict();

var InputTypes = require('./inputTypes');

Expand Down
2 changes: 1 addition & 1 deletion dist/questionPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }

var React = require('react');
var _ = require('lodash');
var _ = require('lodash').noConflict();
var KeyCodez = require('keycodez');

var Validation = require('./lib/validation');
Expand Down
2 changes: 1 addition & 1 deletion dist/questionSet.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }

var React = require('react');
var _ = require('lodash');
var _ = require('lodash').noConflict();

var Question = require('./question');

Expand Down
8 changes: 4 additions & 4 deletions dist/winterfell.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var React = require('react');
var _ = require('lodash');
var _ = require('lodash').noConflict();

var QuestionPanel = require('./questionPanel');

Expand Down
2 changes: 1 addition & 1 deletion src/lib/validation.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var _ = require('lodash');
var _ = require('lodash').noConflict();
var Validator = require('validator');
var StringParser = require('./stringParser');

Expand Down
2 changes: 1 addition & 1 deletion src/question.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var React = require('react');
var _ = require('lodash');
var _ = require('lodash').noConflict();

var InputTypes = require('./inputTypes');

Expand Down
2 changes: 1 addition & 1 deletion src/questionPanel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var React = require('react');
var _ = require('lodash');
var _ = require('lodash').noConflict();
var KeyCodez = require('keycodez');

var Validation = require('./lib/validation');
Expand Down
2 changes: 1 addition & 1 deletion src/questionSet.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var React = require('react');
var _ = require('lodash');
var _ = require('lodash').noConflict();

var Question = require('./question');

Expand Down