From 746a953e8fd0f8a00e144a11a651020684d83662 Mon Sep 17 00:00:00 2001 From: Fabio Masini Date: Mon, 23 May 2016 23:33:45 +0200 Subject: [PATCH] Outline js is now importable without bundling --- lib/components.js | 6 +++--- lib/models.js | 8 ++++---- lib/utils/env.js | 14 ++++++++------ package.json | 2 +- src/utils/env.js | 9 ++++++++- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/lib/components.js b/lib/components.js index da13893..9be13c0 100755 --- a/lib/components.js +++ b/lib/components.js @@ -63,10 +63,10 @@ var BaseComponent = exports.BaseComponent = function (_React$Component) { try { for (var _iterator = Reflect.ownKeys(proto)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { - var _name = _step.value; + var name = _step.value; - if (Reflect.getOwnPropertyDescriptor(proto, _name).get) { - state[_name] = obj[_name]; + if (Reflect.getOwnPropertyDescriptor(proto, name).get) { + state[name] = obj[name]; hasMethods = true; } } diff --git a/lib/models.js b/lib/models.js index 7bfb04d..b3a540a 100755 --- a/lib/models.js +++ b/lib/models.js @@ -84,11 +84,11 @@ var BaseModel = exports.BaseModel = function (_Backbone$Model) { try { for (var _iterator2 = Reflect.ownKeys(proto)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { - var _name = _step2.value; + var name = _step2.value; - if (Reflect.getOwnPropertyDescriptor(proto, _name).set) { - if (props[_name] !== undefined) { - this[_name] = props[_name]; + if (Reflect.getOwnPropertyDescriptor(proto, name).set) { + if (props[name] !== undefined) { + this[name] = props[name]; hasProps = true; } } diff --git a/lib/utils/env.js b/lib/utils/env.js index 20ac7cd..041045e 100644 --- a/lib/utils/env.js +++ b/lib/utils/env.js @@ -6,13 +6,15 @@ Object.defineProperty(exports, "__esModule", { var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); -var _outline_env = require('__outline_env'); - -var _outline_env2 = _interopRequireDefault(_outline_env); +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +var _env = undefined; -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } +try { + _env = require('__outline_env'); +} catch (ex) { + _env = {}; +} var _class = function () { function _class() { @@ -22,7 +24,7 @@ var _class = function () { _createClass(_class, null, [{ key: 'get', value: function get(value) { - return _outline_env2.default[value]; + return _env[value]; } }]); diff --git a/package.json b/package.json index e064af7..a33a712 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "outlinejs", - "version": "1.3.30", + "version": "1.3.31", "description": "Javascript App Outline", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", diff --git a/src/utils/env.js b/src/utils/env.js index ee8c81d..0995ba6 100644 --- a/src/utils/env.js +++ b/src/utils/env.js @@ -1,4 +1,11 @@ -import _env from '__outline_env'; +let _env; + +try { + _env = require('__outline_env'); +} catch (ex) { + _env = {}; +} + export default class { static get(value) { return _env[value];