suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #349 from travis-ci/ember-1.11.3

Browse Source 
Update Ember to 1.11.3
This commit is contained in:
Piotr Sarnacki 2015-05-07 12:18:18 +02:00
commit 971691852f
28 changed files with 134 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.editorconfig
View File

@ -18,6 +18,7 @@ indent_style = space
indent_size = 2
[*.hbs]
insert_final_newline = false
indent_style = space
indent_size = 2

19
.travis.yml
View File

@ -2,6 +2,20 @@
language: node_js
node_js: "0.10.36"
env:
- EMBER_VERSION=default
- EMBER_VERSION=release
- EMBER_VERSION=beta
- EMBER_VERSION=canary
matrix:
allow_failures:
- env: EMBER_VERSION=release
- env: EMBER_VERSION=beta
- env: EMBER_VERSION=canary
fast_finish: true
addons:
sauce_connect: true
@ -21,7 +35,7 @@ install:
- bower install
script:
- npm test
- ember try $EMBER_VERSION
notifications:
campfire:
@ -42,3 +56,6 @@ deploy:
acl: public_read
local_dir: dist
region: us-east-1
on:
branch: master
condition: "$EMBER_VERSION = default"

7
Brocfile.js
View File

@ -21,7 +21,12 @@ if (process.env.DISABLE_FINGERPRINTS) {
}
var app = new EmberApp({
fingerprint: fingerprint
fingerprint: fingerprint,
vendorFiles: {
// next line is needed to prevent ember-cli to load
// handlebars (it happens automatically in 0.1.x)
'handlebars.js': null
}
});
app.import('bower_components/pusher/dist/pusher.js');

10
app/app.coffee
View File

@ -7,15 +7,13 @@
`import label from 'travis/helpers/label'`
`import travisField from 'travis/helpers/travis-field'`
`import travisErrors from 'travis/helpers/travis-errors'`
`import tipsy from 'travis/helpers/tipsy'`
#`import input from 'travis/helpers/input'`
`import filterInput from 'travis/helpers/filter-input'`
Ember.Handlebars.registerHelper('label', label)
Ember.Handlebars.registerHelper('travis-field', travisField)
Ember.Handlebars.registerHelper('travis-errors', travisErrors)
Ember.Handlebars.registerHelper('tipsy', tipsy)
Ember.HTMLBars._registerHelper('label', label)
Ember.HTMLBars._registerHelper('travis-field', travisField)
Ember.HTMLBars._registerHelper('travis-errors', travisErrors)
#Ember.Handlebars.registerHelper('input', input)
Ember.Handlebars.registerHelper('filter-input', filterInput)
Ember.HTMLBars._registerHelper('filter-input', filterInput)
Ember.Handlebars.registerBoundHelper('mb', mb)
Ember.MODEL_FACTORY_INJECTIONS = true

8
app/controllers/ssh-key.coffee
View File

@ -20,8 +20,14 @@ Controller = Ember.ObjectController.extend Validations,
add: ->
id = @get('repo.id')
model = @store.recordForId('sshKey', id)
if model.get('currentState.stateName') == 'root.empty'
# TODO: this can be removed in favor of simply unloading record
# once https://github.com/emberjs/data/pull/2867
# and https://github.com/emberjs/data/pull/2870 are merged
if model
@store.dematerializeRecord(model)
typeMap = @store.typeMapFor('sshKey')
idToRecord = typeMap.idToRecord
delete idToRecord[id]
model = @store.createRecord('sshKey', id: id)
@set('model', model)

12
app/helpers/filter-input.coffee
View File

@ -7,12 +7,12 @@ TextField = Ember.TextField.extend
_elementValueDidChange: ->
@set('_value', @$().val());
fn = (options) ->
Ember.assert('You can only pass attributes to the `input` helper, not arguments', arguments.length < 2)
fn = (params, hash, options, env) ->
Ember.assert('You can only pass attributes to the `input` helper, not arguments', params.length)
onEvent = options.hash.on
delete options.hash.on
options.hash.onEvent = onEvent || 'enter'
return Ember.Handlebars.helpers.view.call(this, TextField, options)
onEvent = hash.on
delete hash.on
hash.onEvent = onEvent || 'enter'
env.helpers.view.helperFunction.call(this, [TextField], hash, options, env)
`export default fn`

4
app/helpers/format-message.coffee
View File

@ -1,7 +1,7 @@
`import { formatMessage as _formatMessage, safe } from 'travis/utils/helpers'`
`import Ember from "ember"`
helper = Ember.Handlebars.makeBoundHelper (message, options) ->
safe _formatMessage(message, options.hash)
helper = Ember.HTMLBars.makeBoundHelper (params, hash) ->
safe _formatMessage(params[0], hash)
`export default helper`

17
app/helpers/label.coffee
View File

@ -7,15 +7,16 @@ LabelView = Ember.View.extend(
classNameBindings: ['class']
)
label = (options) ->
label = (params, hash, options, env) ->
view = LabelView
name = options.hash.for
controller = env.data.view.get('controller')
name = hash.for
if name
labels = @get('_labels')
labels = controller.get('_labels')
unless labels
labels = Ember.Object.create()
@set('_labels', labels)
controller.set('_labels', labels)
# for now I support only label + input in their own context
id = labels.get(name)
@ -23,12 +24,10 @@ label = (options) ->
id = "#{name}-#{Math.round(Math.random() * 1000000)}"
labels.set(name, id)
options.hash.for = id
options.hashTypes.for = 'STRING'
options.hashContexts.for = this
if options.hash.content
hash.for = id
if hash.content
view = view.extend(templateName: 'helpers/label')
Ember.Handlebars.helpers.view.call(this, view, options)
env.helpers.view.helperFunction.call(this, [view], hash, options, env)
`export default label`

7
app/helpers/tipsy.coffee
View File

@ -1,7 +0,0 @@
`import { safe } from 'travis/utils/helpers'`
`import Ember from "ember"`
helper = Ember.Handlebars.makeBoundHelper (text, tip) ->
safe '<span class="tool-tip" original-title="' + tip + '">' + text + '</span>'
`export default helper`

11
app/helpers/travis-errors.coffee
View File

@ -10,14 +10,15 @@ ErrorsView = Ember.View.extend
).property('@errors', 'errors.length')
show: Ember.computed.notEmpty('errors.[]')
fn = (name, options) ->
errors = @get('errors').for(name)
window[name + 'Errors'] = errors
fn = (params, hash, options, env) ->
name = params[0]
controller = env.data.view.get('controller')
errors = controller.get('errors').for(name)
view = ErrorsView.create(
controller: this
controller: controller
errors: errors
)
Ember.Handlebars.helpers.view.call(this, view, options)
env.helpers.view.helperFunction.call(this, [view], hash, options, env)
`export default fn`

14
app/helpers/travis-field.coffee
View File

@ -5,19 +5,21 @@ FormFieldRowView = Ember.View.extend
classNameBindings: ['invalid']
classNames: 'field'
fn = (name, options) ->
errors = @get('errors').for(name)
template = options.fn
delete options.fn
fn = (params, hash, options, env) ->
name = params[0]
controller = env.data.view.get('controller')
errors = controller.get('errors').for(name)
template = options.template
delete options.template
view = FormFieldRowView.create(
controller: this
controller: controller
template: template
errors: errors
name: name
classNameBindings: ['name']
)
Ember.Handlebars.helpers.view.call(this, view, options)
env.helpers.view.helperFunction.call(this, [view], hash, options, env)
`export default fn`

1
app/styles/app.scss
View File

@ -36,7 +36,6 @@
// @import "app/right";
@import "app/settings";
@import "app/tabs";
@import "app/tipsy";
@import "app/components/travis-switch";
@import "app/components/sync-button";

3
app/styles/app/forms.scss
View File

@ -197,8 +197,5 @@
.error, div.error > input {
border-color: #c00;
}
.tipsy {
margin-left: 20px;
}
}
}

2
app/styles/app/modules/tabs.sass
View File

@ -34,7 +34,7 @@
@media #{$medium-up}
ul
@extend %inline-block
display: block
li
float: left
padding-right: 2em

25
app/styles/app/tipsy.scss
View File

@ -1,25 +0,0 @@
.tipsy { font-size: 10px; position: absolute; padding: 5px; z-index: 100000; }
.tipsy-inner { background-color: #000; color: #FFF; max-width: 200px; padding: 5px 8px 4px 8px; text-align: center; }
/* Rounded corners */
.tipsy-inner { border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; }
/* Uncomment for shadow */
/*.tipsy-inner { box-shadow: 0 0 5px #000000; -webkit-box-shadow: 0 0 5px #000000; -moz-box-shadow: 0 0 5px #000000; }*/
.tipsy-arrow { position: absolute; width: 0; height: 0; line-height: 0; border: 5px dashed #000; }
/* Rules to colour arrows */
.tipsy-arrow-n { border-bottom-color: #000; }
.tipsy-arrow-s { border-top-color: #000; }
.tipsy-arrow-e { border-left-color: #000; }
.tipsy-arrow-w { border-right-color: #000; }
.tipsy-n .tipsy-arrow { top: 0px; left: 50%; margin-left: -5px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent; }
.tipsy-nw .tipsy-arrow { top: 0; left: 10px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent;}
.tipsy-ne .tipsy-arrow { top: 0; right: 10px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent;}
.tipsy-s .tipsy-arrow { bottom: 0; left: 50%; margin-left: -5px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; }
.tipsy-sw .tipsy-arrow { bottom: 0; left: 10px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; }
.tipsy-se .tipsy-arrow { bottom: 0; right: 10px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; }
.tipsy-e .tipsy-arrow { right: 0; top: 50%; margin-top: -5px; border-left-style: solid; border-right: none; border-top-color: transparent; border-bottom-color: transparent; }
.tipsy-w .tipsy-arrow { left: 0; top: 50%; margin-top: -5px; border-right-style: solid; border-left: none; border-top-color: transparent; border-bottom-color: transparent; }

7
app/templates/build.hbs
View File

@ -14,14 +14,14 @@
{{build.pullRequestTitle}}
{{else}}
<small class="repo-main-branch" {{bind-attr title="build.commit.branch"}}>{{build.commit.branch}}</small>
{{format-message build.commit.subject repoBinding=build.repo}}
{{format-message build.commit.subject repo=build.repo}}
{{/if}}
</h2>
<div class="repo-main-description">
{{#if build.pullRequest}}
<p>{{format-message build.commit.subject repoBinding=build.repo}}</p>
<p>{{format-message build.commit.subject repo=build.repo}}</p>
{{/if}}
<pre class="body">{{format-message build.commit.body repoBinding=build.repo pre=true}}</pre>
<pre class="body">{{format-message build.commit.body repo=build.repo pre=true}}</pre>
</div>
<div class="tile-author">
{{#if commit.authorName}}
@ -61,6 +61,7 @@
<li>
<span class="icon icon--clock"></span>
{{#if build.isFinished}}ran{{else}}running{{/if}} for {{format-duration build.duration}}
</li>
<li {{bind-attr title="build.finishedAt"}}>
<span class="icon icon--cal"></span>
{{format-time build.finishedAt}}

2
app/templates/components/build-repo-actions.hbs
View File

@ -14,7 +14,7 @@
<span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
{{else}}
<a href="#" {{action "restart"}} class="button-circle" title="Restart Build">
<span class="icon icon--trigger">
<span class="icon icon--trigger"></span>
</a>
{{/if}}
{{/if}}

2
app/templates/components/job-repo-actions.hbs
View File

@ -13,7 +13,7 @@
<span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>
{{else}}
<a href="#" {{action "restart"}} class="button-circle" title="Restart Job">
<span class="icon icon--trigger">
<span class="icon icon--trigger"></span>
</a>
{{/if}}
{{/if}}

2
app/templates/components/repo-actions.hbs
View File

@ -11,7 +11,7 @@
{{#if displayCodeClimate}}
<a href="#" name="code-climate"
{{action "codeClimatePopup"}} class="button-circle open-popup"
{{bind-attr class=":open-popup"}} title="Test Coverage with Code Climate">
title="Test Coverage with Code Climate">
<span class="icon icon--codeclimate"></span>
</a>
{{/if}}

1
app/templates/job.hbs
View File

@ -49,6 +49,7 @@
<li>
<span class="icon icon--clock"></span>
{{#if job.isFinished}}ran{{else}}running{{/if}} for {{format-duration job.duration}}
</li>
<li>
<span class="icon icon--cal"></span>
{{format-time job.finishedAt}}

9
app/templates/queue.hbs
View File

@ -2,11 +2,10 @@
{{#if length}}
{{#each job in controller}}
<div {{bind-attr class=":tile :tile--sidebar job.state"}}>
{{#if job.repo.slug}}
<span {{bind-attr class=":icon :icon--job job.state"}}></span>
{{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}}
{{/if}}
</h2>
{{#if job.repo.slug}}
<span {{bind-attr class=":icon :icon--job job.state"}}></span>
{{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}}
{{/if}}
<p class="tile-title float-right">
<span class="icon icon--hash"></span>

3
app/templates/repo.hbs
View File

@ -19,12 +19,13 @@
<div class="repo-menus">
<div class="repo-menu-header">
{{view 'repo-show-tools'}}
{{view 'repo-show-tabs'}}
</div>
<div class="tabbody repo-main">
{{outlet}}
</div>
</div>
</article>
{{else}}

9
app/templates/running-jobs.hbs
View File

@ -2,11 +2,10 @@
{{#if controller.length}}
{{#each job in controller}}
<div {{bind-attr class=":tile :tile--sidebar job.state"}}>
{{#if job.repo.slug}}
<span {{bind-attr class=":icon :icon--job job.state"}}></span>
{{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}}
{{/if}}
</h2>
{{#if job.repo.slug}}
<span {{bind-attr class=":icon :icon--job job.state"}}></span>
{{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}}
{{/if}}
<p class="tile-title float-right">
<span class="icon icon--hash"></span>

2
app/templates/settings/index.hbs
View File

@ -15,7 +15,7 @@
</p>
<p class="settings-row">
<p class="short-settings-element" {{bind-attr class="settings.maximum_number_of_builds_valid"}}>
<p {{bind-attr class=":short-settings-element settings.maximum_number_of_builds_valid"}}>
{{input value=settings.maximum_number_of_builds size="4" pattern='/^[0-9]+$/'}}
</p>
<label>

2
app/templates/ssh-key/_form.hbs
View File

@ -9,7 +9,7 @@
{{/travis-field}}
<div class="actions">
<input type="submit" {{bind-attr value=actionType class=":submit-ssh-key isSaving:saving" disabled=isSaving}} />
<input type="submit" value="Add" class="submit-ssh-key {{if isSaving 'saving'}}" {{if isSaving 'dsabled="disabled"'}} />
<span class="or">or</span>
<a href="#" class="cancel-ssh-key" {{action "cancel"}}>Cancel</a>
</div>

10
bower.json
View File

@ -3,14 +3,14 @@
"dependencies": {
"handlebars": "2.0.0",
"jquery": "^1.11.1",
"ember": "1.9.1",
"ember-data": "1.0.0-beta.14",
"ember-resolver": "~0.1.11",
"ember": "1.11.3",
"ember-data": "1.0.0-beta.16.1",
"ember-resolver": "~0.1.15",
"loader.js": "ember-cli/loader.js#1.0.1",
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.0",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
"ember-qunit": "0.1.8",
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
"ember-qunit": "0.3.1",
"ember-qunit-notifications": "0.0.5",
"qunit": "~1.17.1",
"visibilityjs": "~1.2.1",

26
config/ember-try.js Normal file
View File

@ -0,0 +1,26 @@
module.exports = {
scenarios: [
{
name: 'default',
dependencies: {}
},
{
name: "release",
dependencies: {
"ember": "release"
}
},
{
name: "beta",
dependencies: {
"ember": "beta"
}
},
{
name: "canary",
dependencies: {
"ember": "canary"
}
}
]
}

32
package.json
View File

@ -14,31 +14,31 @@
},
"repository": "",
"engines": {
"node": "0.10.33"
"node": "0.10.32"
},
"author": "",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.0.0",
"broccoli-sass": "0.3.3",
"ember-cli": "^0.2.0",
"ember-cli-6to5": "^3.0.0",
"broccoli-asset-rev": "^2.0.2",
"broccoli-sass": "0.6.5",
"ember-cli": "^0.2.3",
"ember-cli-app-version": "0.3.3",
"ember-cli-autoprefixer": "^0.3.0",
"ember-cli-coffeescript": "0.7.0",
"ember-cli-content-security-policy": "0.3.0",
"ember-cli-dependency-checker": "0.0.7",
"ember-cli-document-title": "0.0.1",
"ember-cli-htmlbars": "^0.6.0",
"ember-cli-babel": "5.0.0",
"ember-cli-coffeescript": "0.10.0",
"ember-cli-content-security-policy": "0.4.0",
"ember-cli-dependency-checker": "0.0.8",
"ember-cli-document-title": "0.1.0",
"ember-cli-htmlbars": "0.7.4",
"ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-inline-images": "^0.0.4",
"ember-cli-pretender": "0.3.1",
"ember-cli-qunit": "0.3.0",
"ember-cli-sauce": "0.0.7",
"ember-cli-qunit": "0.3.10",
"ember-cli-sauce": "^1.1.0",
"ember-cli-uglify": "1.0.1",
"ember-data": "1.0.0-beta.12",
"ember-export-application-global": "^1.0.0",
"express": "^4.8.5",
"glob": "^4.0.5"
"ember-data": "1.0.0-beta.16.1",
"ember-export-application-global": "^1.0.2",
"ember-try": "0.0.5"
}
}