Skip to content

Commit

Permalink
Merge pull request #163 from oknosoft/develop
Browse files Browse the repository at this point in the history
v0.11.220 downgrade pouchdb 6.0 -> 5.4
  • Loading branch information
unpete authored Sep 13, 2016
2 parents abe0d26 + 9159ee8 commit f8dd488
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 22 deletions.
2 changes: 1 addition & 1 deletion dist/metadata.core.js
Original file line number Diff line number Diff line change
Expand Up @@ -6260,7 +6260,7 @@ function CatManager(class_name) {
*/
$p[this.obj_constructor()].prototype.__define("is_folder", {
get : function(){ return this._obj.is_folder || false},
set : function(v){ this._obj.is_folder = utils.fix_boolean(v)},
set : function(v){ this._obj.is_folder = $p.utils.fix_boolean(v)},
enumerable: true,
configurable: true
});
Expand Down
4 changes: 2 additions & 2 deletions dist/metadata.core.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -7218,7 +7218,7 @@ function CatManager(class_name) {
*/
$p[this.obj_constructor()].prototype.__define("is_folder", {
get : function(){ return this._obj.is_folder || false},
set : function(v){ this._obj.is_folder = utils.fix_boolean(v)},
set : function(v){ this._obj.is_folder = $p.utils.fix_boolean(v)},
enumerable: true,
configurable: true
});
Expand Down
2 changes: 1 addition & 1 deletion dist/metadata.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions history.md
Original file line number Diff line number Diff line change
Expand Up @@ -320,4 +320,5 @@
### 13.09.2016
- Лицензия AGPL изменена на MIT
- Метод _russian_names_ удалён из прототипа _Messages_
- Версия pouchdb изменена с 6.0 на 5.4 - downgrade из-за проблем с установкой [leveldown под windows](https://github.com/level/levelup/issues/5)
- Собран пререлиз metadata-core v2.0.0-beta.1
2 changes: 1 addition & 1 deletion lib/metadata.core.js
Original file line number Diff line number Diff line change
Expand Up @@ -6260,7 +6260,7 @@ function CatManager(class_name) {
*/
$p[this.obj_constructor()].prototype.__define("is_folder", {
get : function(){ return this._obj.is_folder || false},
set : function(v){ this._obj.is_folder = utils.fix_boolean(v)},
set : function(v){ this._obj.is_folder = $p.utils.fix_boolean(v)},
enumerable: true,
configurable: true
});
Expand Down
2 changes: 1 addition & 1 deletion lib/metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -7218,7 +7218,7 @@ function CatManager(class_name) {
*/
$p[this.obj_constructor()].prototype.__define("is_folder", {
get : function(){ return this._obj.is_folder || false},
set : function(v){ this._obj.is_folder = utils.fix_boolean(v)},
set : function(v){ this._obj.is_folder = $p.utils.fix_boolean(v)},
enumerable: true,
configurable: true
});
Expand Down
2 changes: 1 addition & 1 deletion lib/metadata.min.js

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"decompress": ">=4.0",
"moment": ">=2.15",
"node-localstorage": ">=1.3",
"pouchdb": "^6.0",
"pouchdb-core": "^6.0",
"pouchdb-adapter-http": "^6.0",
"pouchdb-adapter-memory": "^6.0",
"pouchdb-adapter-idb": "^6.0",
"pouchdb-mapreduce": "^6.0",
"pouchdb-replication": "^6.0",
"pouchdb": "^5.4",
"pouchdb-core": "^5.4",
"pouchdb-adapter-http": "^5.4",
"pouchdb-adapter-memory": "^5.4",
"pouchdb-adapter-idb": "^5.4",
"pouchdb-mapreduce": "^5.4",
"pouchdb-replication": "^5.4",
"pouchdb-authentication": "^0.5",
"rimraf": ">=0.1",
"yargs": ">=4.8"
Expand Down
12 changes: 6 additions & 6 deletions packages/metadata-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"dependencies": {
"alasql": ">=0.3",
"moment": ">=2.15",
"pouchdb-core": "^6.0",
"pouchdb-adapter-http": "^6.0",
"pouchdb-adapter-memory": "^6.0",
"pouchdb-adapter-idb": "^6.0",
"pouchdb-mapreduce": "^6.0",
"pouchdb-replication": "^6.0",
"pouchdb-core": "^5.4",
"pouchdb-adapter-http": "^5.4",
"pouchdb-adapter-memory": "^5.4",
"pouchdb-adapter-idb": "^5.4",
"pouchdb-mapreduce": "^5.4",
"pouchdb-replication": "^5.4",
"pouchdb-authentication": "^0.5"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion src/meta_mngrs.js
Original file line number Diff line number Diff line change
Expand Up @@ -2642,7 +2642,7 @@ function CatManager(class_name) {
*/
$p[this.obj_constructor()].prototype.__define("is_folder", {
get : function(){ return this._obj.is_folder || false},
set : function(v){ this._obj.is_folder = utils.fix_boolean(v)},
set : function(v){ this._obj.is_folder = $p.utils.fix_boolean(v)},
enumerable: true,
configurable: true
});
Expand Down

0 comments on commit f8dd488

Please sign in to comment.