10000 Stable Version 1.5.6. · digitaldeployment/js-data@1c9d2a7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1c9d2a7

Browse files
jmdobryjmdobry
committed
Stable Version 1.5.6.
1 parent ef7321f commit 1c9d2a7

File tree

7 files changed

+79
-71
lines changed

7 files changed

+79
-71
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
##### 1.5.6 - 07 March 2015
2+
3+
###### Backwards compatible bug fixes
4+
- Fixed loading of the optional js-data-schema
5+
16
##### 1.5.5 - 07 March 2015
27

38
###### Other

‎dist/js-data-debug.js

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* js-data
3-
* @version 1.5.5 - Homepage <http://www.js-data.io/>
3+
* @version 1.5.6 - Homepage <http://www.js-data.io/>
44
* @author Jason Dobry <jason.dobry@gmail.com>
55
* @copyright (c) 2014-2015 Jason Dobry
66
* @license MIT <https://github.com/js-data/js-data/blob/master/LICENSE>
@@ -79,10 +79,10 @@ return /******/ (function(modules) { // webpackBootstrap
7979
DSUtils: DSUtils,
8080
DSErrors: DSErrors,
8181
version: {
82-
full: "1.5.5",
82+
full: "1.5.6",
8383
major: parseInt("1", 10),
8484
minor: parseInt("5", 10),
85-
patch: parseInt("5", 10),
85+
patch: parseInt("6", 10),
8686
alpha: true ? "false" : false,
8787
beta: true ? "false" : false
8888
}
@@ -1242,8 +1242,9 @@ return /******/ (function(modules) { // webpackBootstrap
12421242
} catch (e) {}
12431243
}
12441244

1245-
if (Schemator || options.schemator) {
1246-
_this.schemator = options.schemator || new Schemator();
1245+
Schemator = Schemator || options.schemator;
1246+
if (typeof Schemator === &qu 8000 ot;function") {
1247+
_this.schemator = new Schemator();
12471248
}
12481249

12491250
_this.store = {};
@@ -3551,7 +3552,7 @@ return /******/ (function(modules) { // webpackBootstrap
35513552
/* 18 */
35523553
/***/ function(module, exports, __webpack_require__) {
35533554

3554-
var isPrimitive = __webpack_require__(26);
3555+
var isPrimitive = __webpack_require__(27);
35553556

35563557
/**
35573558
* get "nested" object property
@@ -3577,7 +3578,7 @@ return /******/ (function(modules) { // webpackBootstrap
35773578
/* 19 */
35783579
/***/ function(module, exports, __webpack_require__) {
35793580

3580-
var namespace = __webpack_require__(27);
3581+
var namespace = __webpack_require__(26);
35813582

35823583
/**
35833584
* set "nested" object property
@@ -3788,6 +3789,31 @@ return /******/ (function(modules) { // webpackBootstrap
37883789
/* 26 */
37893790
/***/ function(module, exports, __webpack_require__) {
37903791

3792+
var forEach = __webpack_require__(10);
3793+
3794+
/**
3795+
* Create nested object if non-existent
3796+
*/
3797+
function namespace(obj, path){
3798+
if (!path) return obj;
3799+
forEach(path.split('.'), function(key){
3800+
if (!obj[key]) {
3801+
obj[key] = {};
3802+
}
3803+
obj = obj[key];
3804+
});
3805+
return obj;
3806+
}
3807+
3808+
module.exports = namespace;
3809+
3810+
3811+
3812+
3813+
/***/ },
3814+
/* 27 */
3815+
/***/ function(module, exports, __webpack_require__) {
3816+
37913817

37923818

37933819
/**
@@ -3811,31 +3837,6 @@ return /******/ (function(modules) { // webpackBootstrap
38113837

38123838

38133839

3814-
/***/ },
3815-
/* 27 */
3816-
/***/ function(module, exports, __webpack_require__) {
3817-
3818-
var forEach = __webpack_require__(10);
3819-
3820-
/**
3821-
* Create nested object if non-existent
3822-
*/
3823-
function namespace(obj, path){
3824-
if (!path) return obj;
3825-
forEach(path.split('.'), function(key){
3826-
if (!obj[key]) {
3827-
obj[key] = {};
3828-
}
3829-
obj = obj[key];
3830-
});
3831-
return obj;
3832-
}
3833-
3834-
module.exports = namespace;
3835-
3836-
3837-
3838-
38393840
/***/ },
38403841
/* 28 */
38413842
/***/ function(module, exports, __webpack_require__) {

‎dist/js-data.js

Lines changed: 33 additions & 32 deletions
F438
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* js-data
3-
* @version 1.5.5 - Homepage <http://www.js-data.io/>
3+
* @version 1.5.6 - Homepage <http://www.js-data.io/>
44
* @author Jason Dobry <jason.dobry@gmail.com>
55
* @copyright (c) 2014-2015 Jason Dobry
66
* @license MIT <https://github.com/js-data/js-data/blob/master/LICENSE>
@@ -79,10 +79,10 @@ return /******/ (function(modules) { // webpackBootstrap
7979
DSUtils: DSUtils,
8080
DSErrors: DSErrors,
8181
version: {
82-
full: "1.5.5",
82+
full: "1.5.6",
8383
major: parseInt("1", 10),
8484
minor: parseInt("5", 10),
85-
patch: parseInt("5", 10),
85+
patch: parseInt("6", 10),
8686
alpha: true ? "false" : false< 10000 span class=pl-kos>,
8787
beta: true ? "false" : false
8888
}
@@ -1242,8 +1242,9 @@ return /******/ (function(modules) { // webpackBootstrap
12421242
} catch (e) {}
12431243
}
12441244

1245-
if (Schemator || options.schemator) {
1246-
_this.schemator = options.schemator || new Schemator();
1245+
Schemator = Schemator || options.schemator;
1246+
if (typeof Schemator === "function") {
1247+
_this.schemator = new Schemator();
12471248
}
12481249

12491250
_this.store = {};
@@ -3536,7 +3537,7 @@ return /******/ (function(modules) { // webpackBootstrap
35363537
/* 18 */
35373538
/***/ function(module, exports, __webpack_require__) {
35383539

3539-
var isPrimitive = __webpack_require__(26);
3540+
var isPrimitive = __webpack_require__(27);
35403541

35413542
/**
35423543
* get "nested" object property
@@ -3562,7 +3563,7 @@ return /******/ (function(modules) { // webpackBootstrap
35623563
/* 19 */
35633564
/***/ function(module, exports, __webpack_require__) {
35643565

3565-
var namespace = __webpack_require__(27);
3566+
var namespace = __webpack_require__(26);
35663567

35673568
/**
35683569
* set "nested" object property
@@ -3773,6 +3774,31 @@ return /******/ (function(modules) { // webpackBootstrap
37733774
/* 26 */
37743775
/***/ function(module, exports, __webpack_require__) {
37753776

3777+
var forEach = __webpack_require__(10);
3778+
3779+
/**
3780+
* Create nested object if non-existent
3781+
*/
3782+
function namespace(obj, path){
3783+
if (!path) return obj;
3784+
forEach(path.split('.'), function(key){
3785+
if (!obj[key]) {
3786+
obj[key] = {};
3787+
}
3788+
obj = obj[key];
3789+
});
3790+
return obj;
3791+
}
3792+
3793+
module.exports = namespace;
3794+
3795+
3796+
3797+
3798+
/***/ },
3799+
/* 27 */
3800+
/***/ function(module, exports, __webpack_require__) {
3801+
37763802

37773803

37783804
/**
@@ -3796,31 +3822,6 @@ return /******/ (function(modules) { // webpackBootstrap
37963822

37973823

37983824

3799-
/***/ },
3800-
/* 27 */
3801-
/***/ function(module, exports, __webpack_require__) {
3802-
3803-
var forEach = __webpack_require__(10);
3804-
3805-
/**
3806-
* Create nested object if non-existent
3807-
*/
3808-
function namespace(obj, path){
3809-
if (!path) return obj;
3810-
forEach(path.split('.'), function(key){
3811-
if (!obj[key]) {
3812-
obj[key] = {};
3813-
}
3814-
obj = obj[key];
3815-
});
3816-
return obj;
3817-
}
3818-
3819-
module.exports = namespace;
3820-
3821-
3822-
3823-
38243825
/***/ },
38253826
/* 28 */
38263827
/***/ function(module, exports, __webpack_require__) {

‎dist/js-data.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js-data.min.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "js-data",
33
"description": "Robust, framework-agnostic in-memory data store.",
4-
"version": "1.5.5",
4+
"version": "1.5.6",
55
"homepage": "http://www.js-data.io",
66
"repository": {
77
"type": "git",

‎src/datastore/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,9 @@ class DS {
316316
}
317317
}
318318

319-
if (Schemator || options.schemator) {
320-
_this.schemator = options.schemator || new Schemator();
319+
Schemator = Schemator || options.schemator;
320+
if (typeof Schemator === 'function') {
321+
_this.schemator = new Schemator();
321322
}
322323

323324
_this.store = {};

0 commit comments

Comments
 (0)
0