From a500f6b307a5e50d152c6a6fe0a94c05d9c09d56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Sat, 16 Mar 2013 00:59:11 +0100
Subject: [PATCH] bind the text entered in the category name text field to the
 badge

---
 .../discourse/templates/modal/edit_category.js.handlebars | 8 ++++----
 .../discourse/views/modal/edit_category_view.js           | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars b/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
index 1317e44b395..49fd5c47b87 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
@@ -1,4 +1,4 @@
-<div class="modal-body">    
+<div class="modal-body">
   <form>
     <label>{{i18n category.name}}</label>
     {{view Discourse.TextField valueBinding="view.category.name" placeholderKey="category.name_placeholder"}}
@@ -12,7 +12,7 @@
           <a href="#" {{action showCategoryTopic target="view"}}>{{i18n category.change_in_category_topic}}</a>
         {{/if}}
       {{else}}
-        {{i18n category.no_description}} 
+        {{i18n category.no_description}}
           {{#if view.category.topic_url}}
           <a {{action showCategoryTopic target="view"}} href="#">{{i18n category.change_in_category_topic}}</a>
           {{/if}}}
@@ -23,7 +23,7 @@
     <label>{{i18n category.badge_colors}}</label>
 
     <div class="category-color-editor">
-        <span class='badge-category' {{bindAttr style="view.colorStyle"}}>{{i18n preview}}</span>
+        <span class='badge-category' {{bindAttr style="view.colorStyle"}}>{{view.categoryName}}</span>
 
         <div class='input-prepend input-append' style="margin-top: 10px;">
           <span class='color-title'>{{i18n category.background_color}}:</span>
@@ -42,4 +42,4 @@
 </div>
 <div class="modal-footer">
   <button class='btn btn-primary' {{bindAttr disabled="view.disabled"}} {{action saveCategory target="view"}}>{{view.buttonTitle}}</button>
-</div>  
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/views/modal/edit_category_view.js b/app/assets/javascripts/discourse/views/modal/edit_category_view.js
index fb1aeb6dd6f..d2e0935a630 100644
--- a/app/assets/javascripts/discourse/views/modal/edit_category_view.js
+++ b/app/assets/javascripts/discourse/views/modal/edit_category_view.js
@@ -29,6 +29,11 @@ Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
     return Em.String.i18n("category.create");
   }).property('category.id'),
 
+  categoryName: (function() {
+    var name = this.get('category.name') || "";
+    return name.trim().length > 0 ? name : Em.String.i18n("preview");
+  }).property('category.name'),
+
   buttonTitle: (function() {
     if (this.get('saving')) return Em.String.i18n("saving");
     return this.get('title');
@@ -69,5 +74,3 @@ Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
   }
 
 });
-
-