From a5c98c794c7661dcfb1ac702a680d306ae710412 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 30 Jan 2015 15:34:32 +0100 Subject: [PATCH] Move Travis.Model to models --- assets/scripts/app/models/account.coffee | 2 +- assets/scripts/app/models/annotation.coffee | 2 +- assets/scripts/app/models/branch.coffee | 2 +- assets/scripts/app/models/broadcast.coffee | 2 +- assets/scripts/app/models/build.coffee | 2 +- assets/scripts/app/models/commit.coffee | 2 +- assets/scripts/app/models/env-var.coffee | 2 +- assets/scripts/app/models/hook.coffee | 2 +- assets/scripts/app/models/job.coffee | 2 +- assets/scripts/app/models/model.coffee | 3 +++ assets/scripts/app/models/repo.coffee | 2 +- assets/scripts/app/models/request.coffee | 2 +- assets/scripts/app/models/user.coffee | 2 +- assets/scripts/lib/travis/model.coffee | 8 -------- 14 files changed, 15 insertions(+), 20 deletions(-) create mode 100644 assets/scripts/app/models/model.coffee delete mode 100644 assets/scripts/lib/travis/model.coffee diff --git a/assets/scripts/app/models/account.coffee b/assets/scripts/app/models/account.coffee index 3af78de9..e09bd399 100644 --- a/assets/scripts/app/models/account.coffee +++ b/assets/scripts/app/models/account.coffee @@ -1,4 +1,4 @@ -require 'travis/model' +require 'models/model' Model = Travis.Model diff --git a/assets/scripts/app/models/annotation.coffee b/assets/scripts/app/models/annotation.coffee index 7a26e231..bcd5af56 100644 --- a/assets/scripts/app/models/annotation.coffee +++ b/assets/scripts/app/models/annotation.coffee @@ -1,4 +1,4 @@ -require 'travis/model' +require 'models/model' Model = Travis.Model diff --git a/assets/scripts/app/models/branch.coffee b/assets/scripts/app/models/branch.coffee index 1daabd36..7d3ad4e1 100644 --- a/assets/scripts/app/models/branch.coffee +++ b/assets/scripts/app/models/branch.coffee @@ -1,4 +1,4 @@ -require 'travis/model' +require 'models/model' Model = Travis.Model diff --git a/assets/scripts/app/models/broadcast.coffee b/assets/scripts/app/models/broadcast.coffee index 4f7e36bd..0502f953 100644 --- a/assets/scripts/app/models/broadcast.coffee +++ b/assets/scripts/app/models/broadcast.coffee @@ -1,4 +1,4 @@ -require 'travis/model' +require 'models/model' Model = Travis.Model diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index a0d4ffdc..b1eba873 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -1,4 +1,4 @@ -require 'travis/model' +require 'models/model' require 'utils/duration-calculations' require 'travis/ajax' diff --git a/assets/scripts/app/models/commit.coffee b/assets/scripts/app/models/commit.coffee index 664a1222..cbcdd209 100644 --- a/assets/scripts/app/models/commit.coffee +++ b/assets/scripts/app/models/commit.coffee @@ -1,4 +1,4 @@ -require 'travis/model' +require 'models/model' Model = Travis.Model diff --git a/assets/scripts/app/models/env-var.coffee b/assets/scripts/app/models/env-var.coffee index 10eeb270..e4b3c634 100644 --- a/assets/scripts/app/models/env-var.coffee +++ b/assets/scripts/app/models/env-var.coffee @@ -1,4 +1,4 @@ -require 'travis/model' +require 'models/model' Model = Travis.Model diff --git a/assets/scripts/app/models/hook.coffee b/assets/scripts/app/models/hook.coffee index fd6c03b1..5f1c1019 100644 --- a/assets/scripts/app/models/hook.coffee +++ b/assets/scripts/app/models/hook.coffee @@ -1,4 +1,4 @@ -require 'travis/model' +require 'models/model' Model = Travis.Model Repo = Travis.Repo diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index 14e129da..46284b1d 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -1,4 +1,4 @@ -require 'travis/model' +require 'models/model' require 'models/log' require 'travis/ajax' diff --git a/assets/scripts/app/models/model.coffee b/assets/scripts/app/models/model.coffee new file mode 100644 index 00000000..a8eadc0e --- /dev/null +++ b/assets/scripts/app/models/model.coffee @@ -0,0 +1,3 @@ +Model = DS.Model.extend() + +Travis.Model = Model diff --git a/assets/scripts/app/models/repo.coffee b/assets/scripts/app/models/repo.coffee index 316fba78..7721734c 100644 --- a/assets/scripts/app/models/repo.coffee +++ b/assets/scripts/app/models/repo.coffee @@ -1,5 +1,5 @@ require 'utils/expandable-record-array' -require 'travis/model' +require 'models/model' Model = Travis.Model ExpandableRecordArray = Travis.ExpandableRecordArray diff --git a/assets/scripts/app/models/request.coffee b/assets/scripts/app/models/request.coffee index 4ad37ecb..396c335a 100644 --- a/assets/scripts/app/models/request.coffee +++ b/assets/scripts/app/models/request.coffee @@ -1,4 +1,4 @@ -require 'travis/model' +require 'models/model' Model = Travis.Model diff --git a/assets/scripts/app/models/user.coffee b/assets/scripts/app/models/user.coffee index 0b30c1cf..8456fcf6 100644 --- a/assets/scripts/app/models/user.coffee +++ b/assets/scripts/app/models/user.coffee @@ -1,5 +1,5 @@ require 'travis/ajax' -require 'travis/model' +require 'models/model' Model = Travis.Model Ajax = Travis.ajax diff --git a/assets/scripts/lib/travis/model.coffee b/assets/scripts/lib/travis/model.coffee deleted file mode 100644 index c60797bc..00000000 --- a/assets/scripts/lib/travis/model.coffee +++ /dev/null @@ -1,8 +0,0 @@ -get = Ember.get -set = Ember.set - -Array.prototype.diff = (a) -> - this.filter (i) -> !(a.indexOf(i) > -1) - - -@Travis.Model = DS.Model.extend()