From e5ae06afebda9cec79130bdef9157e17aec68344 Mon Sep 17 00:00:00 2001 From: Henrik Hodne Date: Wed, 12 Feb 2014 09:53:17 -0600 Subject: [PATCH] Revert "Use switches on settings pane" This reverts commit 357b176f93085bf55311301fa2c07e675dda1e09. This commit seems to be where the bug with enabling hooks was introduced, and reverting this commit seems to fix that bug. Conflicts: assets/scripts/app/controllers.coffee assets/scripts/app/templates/repo/settings.hbs --- assets/scripts/app/components.coffee | 16 +++------------- .../app/templates/components/travis-switch.hbs | 2 +- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/assets/scripts/app/components.coffee b/assets/scripts/app/components.coffee index 09a177fb..da423edd 100644 --- a/assets/scripts/app/components.coffee +++ b/assets/scripts/app/components.coffee @@ -1,19 +1,9 @@ Travis.TravisSwitchComponent = Ember.Component.extend tagName: 'a' classNames: ['travis-switch'] - classNameBindings: ['_active:active'] + classNameBindings: ['active'] - # TODO: how to handle overriding properties to - # avoid naming it _action? - _active: (-> - @get('target.active') || @get('active') - ).property('target.active', 'active') + activeBinding: 'target.active' click: -> - if target = @get('target') - @set('target.active', !@get('target.active')) - else - @set('active', !@get('active')) - # allow for bindings to propagate - Ember.run.next this, -> - @sendAction('action', target) + @sendAction('action', @get('target')) diff --git a/assets/scripts/app/templates/components/travis-switch.hbs b/assets/scripts/app/templates/components/travis-switch.hbs index 18617602..e7b20837 100644 --- a/assets/scripts/app/templates/components/travis-switch.hbs +++ b/assets/scripts/app/templates/components/travis-switch.hbs @@ -1,4 +1,4 @@ -{{#if _active}} +{{#if active}} ON {{else}} OFF