From 9e479cc6085de90a89d5c5750c4fd8971d77c84e Mon Sep 17 00:00:00 2001 From: Matt Stancliff Date: Fri, 8 Jun 2012 21:41:10 +0200 Subject: [PATCH] Update all isArray references to jQuery.isArray This removes Spine.isArray completely --- src/relation.coffee | 5 ++--- src/spine.coffee | 10 +++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/relation.coffee b/src/relation.coffee index 13813039..3117c43d 100644 --- a/src/relation.coffee +++ b/src/relation.coffee @@ -1,5 +1,4 @@ Spine = @Spine or require('spine') -isArray = Spine.isArray require = @require or ((value) -> eval(value)) class Collection extends Spine.Module @@ -38,7 +37,7 @@ class Collection extends Spine.Module delete @model.records[record.id] for record in @all() records = @model.fromJSON(values) - records = [records] unless isArray(records) + records = [records] unless $.isArray(records) for record in records record.newRecord = false @@ -141,4 +140,4 @@ Spine.Model.extend @::[name] = (value) -> association(@).update(value) if value? - association(@).find() \ No newline at end of file + association(@).find() diff --git a/src/spine.coffee b/src/spine.coffee index a338e133..109a7785 100644 --- a/src/spine.coffee +++ b/src/spine.coffee @@ -123,7 +123,7 @@ class Model extends Module @crecords = {} records = @fromJSON(values) - records = [records] unless isArray(records) + records = [records] unless $.isArray(records) for record in records record.id or= record.cid @@ -203,7 +203,7 @@ class Model extends Module return unless objects if typeof objects is 'string' objects = JSON.parse(objects) - if isArray(objects) + if $.isArray(objects) (new @(value) for value in objects) else new @(objects) @@ -486,9 +486,6 @@ createObject = Object.create or (o) -> Func.prototype = o new Func() -isArray = (value) -> - Object::toString.call(value) is '[object Array]' - isBlank = (value) -> return true unless value return false for key of value @@ -503,7 +500,6 @@ Spine = @Spine = {} module?.exports = Spine Spine.version = '1.0.8' -Spine.isArray = isArray Spine.isBlank = isBlank Spine.$ = $ Spine.Events = Events @@ -532,4 +528,4 @@ Model.setup = (name, attributes = []) -> Instance.configure(name, attributes...) Instance -Spine.Class = Module \ No newline at end of file +Spine.Class = Module