From 57c970b692957612bedba81b57fed8b1a2894ad4 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 15 May 2014 14:55:10 -0400
Subject: [PATCH] FIX: enable button is broken when color scheme is not saved
yet
---
app/assets/javascripts/admin/models/color_scheme.js | 4 ++++
.../admin/templates/customize_colors.js.handlebars | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/assets/javascripts/admin/models/color_scheme.js b/app/assets/javascripts/admin/models/color_scheme.js
index 1b85df9f9..e55cad199 100644
--- a/app/assets/javascripts/admin/models/color_scheme.js
+++ b/app/assets/javascripts/admin/models/color_scheme.js
@@ -43,6 +43,10 @@ Discourse.ColorScheme = Discourse.Model.extend(Ember.Copyable, {
return !this.get('changed') || this.get('saving') || _.any(this.get('colors'), function(c) { return !c.get('valid'); });
}.property('changed'),
+ disableEnable: function() {
+ return !this.get('id') || this.get('saving');
+ }.property('id', 'saving'),
+
newRecord: function() {
return (!this.get('id'));
}.property('id'),
diff --git a/app/assets/javascripts/admin/templates/customize_colors.js.handlebars b/app/assets/javascripts/admin/templates/customize_colors.js.handlebars
index c2fa8081f..0ff3147d8 100644
--- a/app/assets/javascripts/admin/templates/customize_colors.js.handlebars
+++ b/app/assets/javascripts/admin/templates/customize_colors.js.handlebars
@@ -18,7 +18,7 @@
<div class="controls">
<button {{action save}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
- <button {{action toggleEnabled}} class="btn">
+ <button {{action toggleEnabled}} {{bind-attr disabled="disableEnable"}} class="btn">
{{#if enabled}}
{{i18n disable}}
{{else}}