From d94b001e81d605e9a597238d8484fd4493eda6aa Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sat, 10 Nov 2012 04:21:49 +0100 Subject: [PATCH] restore isLoaded for repos controller --- assets/scripts/app/controllers/repos.coffee | 3 ++- assets/scripts/app/store.coffee | 6 ++++++ assets/scripts/app/views/repo/show.coffee | 4 ++++ assets/scripts/lib/travis/limited_array.coffee | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/assets/scripts/app/controllers/repos.coffee b/assets/scripts/app/controllers/repos.coffee index 2577c86a..9612b56e 100644 --- a/assets/scripts/app/controllers/repos.coffee +++ b/assets/scripts/app/controllers/repos.coffee @@ -3,6 +3,7 @@ require 'travis/limited_array' Travis.ReposController = Ember.ArrayController.extend defaultTab: 'recent' sortProperties: ['sortOrder'] + isLoadedBinding: 'content.isLoaded' init: -> @activate(@defaultTab) @@ -22,8 +23,8 @@ Travis.ReposController = Ember.ArrayController.extend content = Travis.LimitedArray.create content: Travis.Repo.find() limit: 30 - @set('content', content) + # @set('content', Travis.Repo.find()) viewOwned: -> @set('content', Travis.Repo.accessibleBy(Travis.app.get('currentUser.login'))) diff --git a/assets/scripts/app/store.coffee b/assets/scripts/app/store.coffee index e8b45db0..4f29dfa6 100644 --- a/assets/scripts/app/store.coffee +++ b/assets/scripts/app/store.coffee @@ -28,6 +28,12 @@ Travis.Store = DS.Store.extend result + # TODO use isUpdating once we've upgraded ember-data + loadMany: (type, ids, hashes) -> + result = @_super.apply this, arguments + array.set('isLoaded', true) for array in @typeMapFor(type).recordArrays + result + merge: (type, id, hash) -> if hash == undefined hash = id diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index 36d20c13..c7c40421 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -9,6 +9,10 @@ 'loading' unless @get('repo.isLoaded') ).property('repo.isLoaded') + isEmpty: (-> + @get('repos.isLoaded') && @get('repos.length') == 0 + ).property('repos.length') + urlGithub: (-> Travis.Urls.githubRepo(@get('repo.slug')) ).property('repo.slug'), diff --git a/assets/scripts/lib/travis/limited_array.coffee b/assets/scripts/lib/travis/limited_array.coffee index f11af175..fc6e4d35 100644 --- a/assets/scripts/lib/travis/limited_array.coffee +++ b/assets/scripts/lib/travis/limited_array.coffee @@ -1,5 +1,6 @@ Travis.LimitedArray = Em.ArrayProxy.extend limit: 10 + isLoadedBinding: 'content.isLoaded' init: -> @_super.apply this, arguments @@ -11,7 +12,6 @@ Travis.LimitedArray = Em.ArrayProxy.extend contentArrayDidChange: (array, index, removedCount, addedCount) -> @_super.apply this, arguments - if addedCount > 0 addedObjects = array.slice(index, index + addedCount) arrangedContent = @get('arrangedContent')