Fix a few issues after ember-cli switch
This commit is contained in:
parent
cd83556d36
commit
ab33383d15
|
@ -1,5 +1,5 @@
|
|||
`import Ember from 'ember'`
|
||||
`import ApplicationAdapter from 'adapters/application'`
|
||||
`import ApplicationAdapter from 'travis/adapters/application'`
|
||||
|
||||
Adapter = ApplicationAdapter.extend
|
||||
namespace: 'settings'
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
`import Ember from 'ember'`
|
||||
`import ApplicationAdapter from 'adapters/application'`
|
||||
`import ApplicationAdapter from 'travis/adapters/application'`
|
||||
|
||||
Adapter = ApplicationAdapter.extend
|
||||
namespace: 'settings'
|
||||
|
|
|
@ -3,6 +3,19 @@
|
|||
`import loadInitializers from 'ember/load-initializers'`
|
||||
`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
|
||||
|
||||
App = Ember.Application.extend(Ember.Evented,
|
||||
|
|
|
@ -39,6 +39,7 @@ Controller = Ember.Controller.extend Validations,
|
|||
self.transitionToRoute('env_vars')
|
||||
, =>
|
||||
@set('isSaving', false)
|
||||
else
|
||||
@set('isSaving', false)
|
||||
|
||||
Travis.EnvVarsNewController = Controller
|
||||
`export default Controller`
|
|
@ -4,11 +4,7 @@ ErrorsView = Ember.View.extend
|
|||
tagName: 'span'
|
||||
templateName: 'helpers/travis-errors'
|
||||
classNames: ['error']
|
||||
classNameBindings: ['codes']
|
||||
attributeBindings: ['style']
|
||||
style: (->
|
||||
'display: none' unless @get('show')
|
||||
).property('show')
|
||||
classNameBindings: ['codes', 'show']
|
||||
codes: (->
|
||||
@get('errors').mapBy('code')
|
||||
).property('@errors')
|
||||
|
|
|
@ -199,6 +199,10 @@
|
|||
|
||||
span.error
|
||||
margin-left: 0
|
||||
display: none
|
||||
|
||||
&.show
|
||||
display: inline-block
|
||||
|
||||
label.name, label.value
|
||||
display: none
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
{{else}}
|
||||
<span class="value value-display secure">{{value}}</span>
|
||||
{{/if}}
|
||||
<div style="clear: both"></div>
|
||||
<div class="clear"></div>
|
||||
<div class="field">
|
||||
{{travis-switch active=public class="value"}}
|
||||
{{#label for="secure" class="public"}}Display value in build logs{{/label}}
|
||||
|
|
|
@ -1 +1 @@
|
|||
{{#each view.errors}}{{message}}{{/each}}
|
||||
{{#each erorr in view.errors}}{{error.message}}{{/each}}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
`import Ember from 'ember'`
|
||||
`import BasicView from 'travis/views/basic'`
|
||||
|
||||
View = Ember.View.extend
|
||||
View = BasicView.extend
|
||||
templateName: 'repos/show/tools'
|
||||
|
||||
repoBinding: 'controller.repo'
|
||||
|
|
Loading…
Reference in New Issue
Block a user