vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't shortcircuit promise check for objects

Browse source
This commit is contained in:
Leo Horie 2016-05-26 11:45:48 -04:00
parent ce748f9f71
commit b128fd8232
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mithril.js
View file

@ -14,7 +14,7 @@
"use strict" "use strict"
m.version = function () { m.version = function () {
return "v0.2.4" return "v0.2.5"
} }
var hasOwn = {}.hasOwnProperty var hasOwn = {}.hasOwnProperty
@ -1338,7 +1338,7 @@
} }
m.prop = function (store) { m.prop = function (store) {
if ((store != null && isObject(store) || isFunction(store)) || (typeof Promise !== "undefined" && store instanceof Promise) && if ((store != null && (isObject(store) || isFunction(store)) || ((typeof Promise !== "undefined") && (store instanceof Promise))) &&
isFunction(store.then)) { isFunction(store.then)) {
return propify(store) return propify(store)
} }

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "mithril", "name": "mithril",
"description": "Mithril.js - A Javascript Framework for Building Brilliant Applications", "description": "Mithril.js - A Javascript Framework for Building Brilliant Applications",
"version": "0.2.4", "version": "0.2.5",
"homepage": "http://mithril.js.org", "homepage": "http://mithril.js.org",
"license": "MIT", "license": "MIT",
"author": { "author": {