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

Merge pull request #251 from zzmp/refactor-type-fn

Browse source 
Refactor type fn for readability/brevity
This commit is contained in:
Leo Horie 2014-09-17 17:46:01 -04:00
commit df2a3234df
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
mithril.js
View file

@ -1,5 +1,5 @@
Mithril = m = new function app(window, undefined) { Mithril = m = new function app(window, undefined) {
var type = {}.toString var type = function(obj) {return {}.toString.call(obj)}
var parser = /(?:(^|#|\.)([^#\.\[\]]+))|(\[.+?\])/g, attrParser = /\[(.+?)(?:=("|'|)(.*?)\2)?\]/ var parser = /(?:(^|#|\.)([^#\.\[\]]+))|(\[.+?\])/g, attrParser = /\[(.+?)(?:=("|'|)(.*?)\2)?\]/
var voidElements = /AREA|BASE|BR|COL|COMMAND|EMBED|HR|IMG|INPUT|KEYGEN|LINK|META|PARAM|SOURCE|TR‌​ACK|WBR/ var voidElements = /AREA|BASE|BR|COL|COMMAND|EMBED|HR|IMG|INPUT|KEYGEN|LINK|META|PARAM|SOURCE|TR‌​ACK|WBR/
@ -18,7 +18,7 @@ Mithril = m = new function app(window, undefined) {
*/ */
function m() { function m() {
var args = Array.prototype.slice.call(arguments, 0) var args = Array.prototype.slice.call(arguments, 0)
var hasAttrs = args[1] != null && type.call(args[1]) == "[object Object]" && !("tag" in args[1]) && !("subtree" in args[1]) var hasAttrs = args[1] != null && type(args[1]) == "[object Object]" && !("tag" in args[1]) && !("subtree" in args[1])
var attrs = hasAttrs ? args[1] : {} var attrs = hasAttrs ? args[1] : {}
var classAttrName = "class" in attrs ? "class" : "className" var classAttrName = "class" in attrs ? "class" : "className"
var cell = {tag: "div", attrs: {}} var cell = {tag: "div", attrs: {}}
@ -78,7 +78,7 @@ Mithril = m = new function app(window, undefined) {
if (data == null) data = "" if (data == null) data = ""
if (data.subtree === "retain") return cached if (data.subtree === "retain") return cached
var cachedType = type.call(cached), dataType = type.call(data) var cachedType = type(cached), dataType = type(data)
if (cached == null || cachedType != dataType) { if (cached == null || cachedType != dataType) {
if (cached != null) { if (cached != null) {
if (parentCache && parentCache.nodes) { if (parentCache && parentCache.nodes) {
@ -160,7 +160,7 @@ Mithril = m = new function app(window, undefined) {
var item = build(parentElement, parentTag, cached, index, data[i], cached[cacheCount], shouldReattach, index + subArrayCount || subArrayCount, editable, namespace, configs) var item = build(parentElement, parentTag, cached, index, data[i], cached[cacheCount], shouldReattach, index + subArrayCount || subArrayCount, editable, namespace, configs)
if (item === undefined) continue if (item === undefined) continue
if (!item.nodes.intact) intact = false if (!item.nodes.intact) intact = false
var isArray = type.call(item) == "[object Array]" var isArray = type(item) == "[object Array]"
subArrayCount += isArray ? item.length : 1 subArrayCount += isArray ? item.length : 1
cached[cacheCount++] = item cached[cacheCount++] = item
} }
@ -324,7 +324,7 @@ Mithril = m = new function app(window, undefined) {
function unload(cached) { function unload(cached) {
if (cached.configContext && typeof cached.configContext.onunload == "function") cached.configContext.onunload() if (cached.configContext && typeof cached.configContext.onunload == "function") cached.configContext.onunload()
if (cached.children) { if (cached.children) {
if (type.call(cached.children) == "[object Array]") { if (type(cached.children) == "[object Array]") {
for (var i = 0; i < cached.children.length; i++) unload(cached.children[i]) for (var i = 0; i < cached.children.length; i++) unload(cached.children[i])
} }
else if (cached.children.tag) unload(cached.children) else if (cached.children.tag) unload(cached.children)
@ -354,7 +354,7 @@ Mithril = m = new function app(window, undefined) {
var flattened = [] var flattened = []
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
var item = data[i] var item = data[i]
if (type.call(item) == "[object Array]") flattened.push.apply(flattened, flatten(item)) if (type(item) == "[object Array]") flattened.push.apply(flattened, flatten(item))
else flattened.push(item) else flattened.push(item)
} }
return flattened return flattened
@ -889,7 +889,7 @@ Mithril = m = new function app(window, undefined) {
var unwrap = (e.type == "load" ? xhrOptions.unwrapSuccess : xhrOptions.unwrapError) || identity var unwrap = (e.type == "load" ? xhrOptions.unwrapSuccess : xhrOptions.unwrapError) || identity
var response = unwrap(deserialize(extract(e.target, xhrOptions))) var response = unwrap(deserialize(extract(e.target, xhrOptions)))
if (e.type == "load") { if (e.type == "load") {
if (type.call(response) == "[object Array]" && xhrOptions.type) { if (type(response) == "[object Array]" && xhrOptions.type) {
for (var i = 0; i < response.length; i++) response[i] = new xhrOptions.type(response[i]) for (var i = 0; i < response.length; i++) response[i] = new xhrOptions.type(response[i])
} }
else if (xhrOptions.type) response = new xhrOptions.type(response) else if (xhrOptions.type) response = new xhrOptions.type(response)
@ -898,7 +898,7 @@ Mithril = m = new function app(window, undefined) {
} }
catch (e) { catch (e) {
if (e instanceof SyntaxError) throw new SyntaxError("Could not parse HTTP response. See http://lhorie.github.io/mithril/mithril.request.html#using-variable-data-formats") if (e instanceof SyntaxError) throw new SyntaxError("Could not parse HTTP response. See http://lhorie.github.io/mithril/mithril.request.html#using-variable-data-formats")
else if (type.call(e) == "[object Error]" && e.constructor !== Error) throw e else if (type(e) == "[object Error]" && e.constructor !== Error) throw e
else deferred.reject(e) else deferred.reject(e)
} }
if (xhrOptions.background !== true) m.endComputation() if (xhrOptions.background !== true) m.endComputation()