Fix a few issues after ember-cli switch

This commit is contained in:
Piotr Sarnacki 2015-02-06 12:57:49 +01:00
parent cd83556d36
commit ab33383d15
9 changed files with 26 additions and 11 deletions

View File

@ -1,5 +1,5 @@
`import Ember from 'ember'` `import Ember from 'ember'`
`import ApplicationAdapter from 'adapters/application'` `import ApplicationAdapter from 'travis/adapters/application'`
Adapter = ApplicationAdapter.extend Adapter = ApplicationAdapter.extend
namespace: 'settings' namespace: 'settings'

View File

@ -1,5 +1,5 @@
`import Ember from 'ember'` `import Ember from 'ember'`
`import ApplicationAdapter from 'adapters/application'` `import ApplicationAdapter from 'travis/adapters/application'`
Adapter = ApplicationAdapter.extend Adapter = ApplicationAdapter.extend
namespace: 'settings' namespace: 'settings'

View File

@ -3,6 +3,19 @@
`import loadInitializers from 'ember/load-initializers'` `import loadInitializers from 'ember/load-initializers'`
`import config from './config/environment'` `import config from './config/environment'`
`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.Handlebars.registerHelper('input', input)
Ember.Handlebars.registerHelper('filter-input', filterInput)
Ember.MODEL_FACTORY_INJECTIONS = true Ember.MODEL_FACTORY_INJECTIONS = true
App = Ember.Application.extend(Ember.Evented, App = Ember.Application.extend(Ember.Evented,

View File

@ -39,6 +39,7 @@ Controller = Ember.Controller.extend Validations,
self.transitionToRoute('env_vars') self.transitionToRoute('env_vars')
, => , =>
@set('isSaving', false) @set('isSaving', false)
else
@set('isSaving', false)
Travis.EnvVarsNewController = Controller
`export default Controller` `export default Controller`

View File

@ -4,11 +4,7 @@ ErrorsView = Ember.View.extend
tagName: 'span' tagName: 'span'
templateName: 'helpers/travis-errors' templateName: 'helpers/travis-errors'
classNames: ['error'] classNames: ['error']
classNameBindings: ['codes'] classNameBindings: ['codes', 'show']
attributeBindings: ['style']
style: (->
'display: none' unless @get('show')
).property('show')
codes: (-> codes: (->
@get('errors').mapBy('code') @get('errors').mapBy('code')
).property('@errors') ).property('@errors')

View File

@ -199,6 +199,10 @@
span.error span.error
margin-left: 0 margin-left: 0
display: none
&.show
display: inline-block
label.name, label.value label.name, label.value
display: none display: none

View File

@ -12,7 +12,7 @@
{{else}} {{else}}
<span class="value value-display secure">{{value}}</span> <span class="value value-display secure">{{value}}</span>
{{/if}} {{/if}}
<div style="clear: both"></div> <div class="clear"></div>
<div class="field"> <div class="field">
{{travis-switch active=public class="value"}} {{travis-switch active=public class="value"}}
{{#label for="secure" class="public"}}Display value in build logs{{/label}} {{#label for="secure" class="public"}}Display value in build logs{{/label}}

View File

@ -1 +1 @@
{{#each view.errors}}{{message}}{{/each}} {{#each erorr in view.errors}}{{error.message}}{{/each}}

View File

@ -1,6 +1,7 @@
`import Ember from 'ember'` `import Ember from 'ember'`
`import BasicView from 'travis/views/basic'`
View = Ember.View.extend View = BasicView.extend
templateName: 'repos/show/tools' templateName: 'repos/show/tools'
repoBinding: 'controller.repo' repoBinding: 'controller.repo'