Merge branch 'master' of github.com:travis-ci/travis-ember

assets/javascripts/app/models/artifact.coffee

@@ -2,6 +2,19 @@ require 'travis/model'
 
 @Travis.Artifact = Travis.Model.extend
   body: DS.attr('string')
+  init: ->
+    @_super.apply this, arguments
+    @set 'queue', Ember.A([])
 
   append: (body) ->
-    @set('body', @get('body') + body)
+    if @get('isLoaded')
+      @set('body', @get('body') + body)
+    else
+      @get('queue').pushObject(body)
+
+  recordDidLoad: (->
+    if @get('isLoaded')
+      queue = @get('queue')
+      if queue.get('length') > 0
+        @append queue.toArray().join('')
+  ).observes('isLoaded')

assets/javascripts/app/models/build.coffee

@@ -28,11 +28,11 @@ require 'travis/model'
 
   requiredJobs: (->
     @get('jobs').filter (data) -> !data.get('allowFailure')
-  ).property()
+  ).property('jobs.@each.allowFailure')
 
   allowedFailureJobs: (->
     @get('jobs').filter (data) -> data.get('allowFailure')
-  ).property()
+  ).property('jobs.@each.allowFailure')
 
   configKeys: (->
     return [] unless config = @get('config')

assets/javascripts/app/templates/builds/list.hbs

@@ -13,30 +13,28 @@
     <tbody>
       {{#each build in builds}}
         {{#view Travis.BuildsItemView contextBinding="build"}}
-          <tr {{bindAttr class="view.color"}}>
+          <td class="number">
-            <td class="number">
+            <span class="status"></span>
-              <span class="status"></span>
+            {{#if id}}
-              {{#if id}}
+              <a {{action showBuild this href=true}}>
-                <a {{action showBuild this href=true}}>
+                {{number}}
-                  {{number}}
-                </a>
-              {{/if}}
-            </td>
-            <td class="commit">
-              <a {{bindAttr href="view.urlGithubCommit"}}>
-                {{formatCommit commit}}
               </a>
-            </td>
+            {{/if}}
-            <td class="message">
+          </td>
-              {{{formatMessage commit.message short="true"}}}
+          <td class="commit">
-            </td>
+            <a {{bindAttr href="view.urlGithubCommit"}}>
-            <td class="duration" {{bindAttr title="duration"}}>
+              {{formatCommit commit}}
-              {{formatDuration duration}}
+            </a>
-            </td>
+          </td>
-            <td class="finished_at timeago" {{bindAttr title="finishedAt"}}>
+          <td class="message">
-              {{formatTime finishedAt}}
+            {{{formatMessage commit.message short="true"}}}
-            </td>
+          </td>
-          </tr>
+          <td class="duration" {{bindAttr title="duration"}}>
+            {{formatDuration duration}}
+          </td>
+          <td class="finished_at timeago" {{bindAttr title="finishedAt"}}>
+            {{formatTime finishedAt}}
+          </td>
         {{/view}}
       {{/each}}
     </tbody>

assets/javascripts/app/templates/builds/show.hbs

@@ -1,47 +1,47 @@
 {{#with view}}
-  {{#if build.isLoaded}}
+  {{#if loading}}
-    <div id="build" {{bindAttr class="color"}}>
+    <span>Loading</span>
-      <dl id="summary">
+  {{else}}
-        <div class="left">
+    <dl id="summary">
-          <dt>{{t builds.name}}</dt>
+      <div class="left">
-          <dd class="number">
+        <dt>{{t builds.name}}</dt>
-            <span class="status"></span>
+        <dd class="number">
-            {{#if build.id}}
+          <span class="status"></span>
-              <a {{action showBuild build href=true}}>{{build.number}}</a>
+          {{#if build.id}}
-            {{/if}}
+            <a {{action showBuild build href=true}}>{{build.number}}</a>
-          </dd>
-          <dt class="finished_at_label">{{t builds.finished_at}}</dt>
-          <dd class="finished_at timeago" {{bindAttr title="finishedAt"}}>{{formatTime build.finishedAt}}</dd>
-          <dt>{{t builds.duration}}</dt>
-          <dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration build.duration}}</dd>
-        </div>
-
-        <div class="right">
-          <dt>{{t builds.commit}}</dt>
-          <dd class="commit"><a {{bindAttr href="urlGithubCommit"}}>{{formatCommit build.commit}}</a></dd>
-          {{#if commit.compareUrl}}
-            <dt>{{t builds.compare}}</dt>
-            <dd class="compare"><a {{bindAttr href="commit.compareUrl"}}>{{pathFrom build.commit.compareUrl}}</a></dd>
           {{/if}}
-          {{#if commit.authorName}}
+        </dd>
-            <dt>{{t builds.author}}</dt>
+        <dt class="finished_at_label">{{t builds.finished_at}}</dt>
-            <dd class="author"><a {{bindAttr href="urlAuthor"}}>{{build.commit.authorName}}</a></dd>
+        <dd class="finished_at timeago" {{bindAttr title="finishedAt"}}>{{formatTime build.finishedAt}}</dd>
-          {{/if}}
+        <dt>{{t builds.duration}}</dt>
-          {{#if commit.committerName}}
+        <dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration build.duration}}</dd>
-            <dt>{{t builds.committer}}</dt>
+      </div>
-            <dd class="committer"><a {{bindAttr href="urlCommitter"}}>{{build.commit.committerName}}</a></dd>
-          {{/if}}
-        </div>
 
-        <dt>{{t builds.message}}</dt>
+      <div class="right">
-        <dd class="message">{{{formatMessage build.commit.message}}}</dd>
+        <dt>{{t builds.commit}}</dt>
+        <dd class="commit"><a href="{{unbound urlGithubCommit}}">{{formatCommit build.commit}}</a></dd>
+        {{#if commit.compareUrl}}
+          <dt>{{t builds.compare}}</dt>
+          <dd class="compare"><a href="{{unbound commit.compareUrl}}">{{pathFrom build.commit.compareUrl}}</a></dd>
+        {{/if}}
+        {{#if commit.authorName}}
+          <dt>{{t builds.author}}</dt>
+          <dd class="author"><a href="{{unbound urlAuthor}}">{{build.commit.authorName}}</a></dd>
+        {{/if}}
+        {{#if commit.committerName}}
+          <dt>{{t builds.committer}}</dt>
+          <dd class="committer"><a href="{{unbound urlCommitter}}">{{build.commit.committerName}}</a></dd>
+        {{/if}}
+      </div>
 
-        {{#unless isMatrix}}
+      <dt>{{t builds.message}}</dt>
-          <dt>{{t builds.config}}</dt>
+      <dd class="message">{{{formatMessage build.commit.message}}}</dd>
-          <dd class="config">{{formatConfig build.config}}</dd>
+
-        {{/unless}}
+      {{#unless isMatrix}}
-      </dl>
+        <dt>{{t builds.config}}</dt>
-    </div>
+        <dd class="config">{{formatConfig build.config}}</dd>
+      {{/unless}}
+    </dl>
 
     {{#if build.isMatrix}}
       {{view Travis.JobsView jobsBinding="build.requiredJobs" required="true"}}
@@ -49,9 +49,5 @@
     {{else}}
       {{view Travis.LogView contextBinding="build.jobs.firstObject"}}
     {{/if}}
-  {{else}}
-    <div id="build" class="loading">
-      <span>Loading</span>
-    </div>
   {{/if}}
 {{/with}}

assets/javascripts/app/views/build.coffee

@@ -9,6 +9,8 @@
       Travis.Build.olderThanNumber(id, number)
 
   BuildsItemView: Travis.View.extend
+    tagName: 'tr'
+    classNameBindings: ['color']
     repositoryBinding: 'controller.repository'
     buildBinding: 'context'
     commitBinding: 'build.commit'
@@ -27,11 +29,17 @@
 
   BuildView: Travis.View.extend
     templateName: 'builds/show'
+    elementId: 'build'
+    classNameBindings: ['color', 'loading']
 
     repositoryBinding: 'controller.repository'
     buildBinding: 'controller.build'
     commitBinding: 'build.commit'
 
+    loading: (->
+      !@get('build.isLoaded')
+    ).property('build.isLoaded')
+
     color: (->
       Travis.Helpers.colorForResult(@get('build.result'))
     ).property('build.result')