From d4ef582f949c1c24e0335ee2b0e24e4aeb2b3614 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Wed, 10 Jul 2013 10:16:39 +0200 Subject: [PATCH] Correct caption of 'Make Visible' button The variable 'visible' is also used for toggling the admin menu visibility, so it is always true when the visibility toggle is shown. Hence, it's caption is always 'Make Invisible', even when the topic already is invisible. --- .../discourse/controllers/topic_admin_menu_controller.js | 6 +++--- .../discourse/templates/topic_admin_menu.js.handlebars | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/topic_admin_menu_controller.js b/app/assets/javascripts/discourse/controllers/topic_admin_menu_controller.js index 45e06232de3..24d5fedefcd 100644 --- a/app/assets/javascripts/discourse/controllers/topic_admin_menu_controller.js +++ b/app/assets/javascripts/discourse/controllers/topic_admin_menu_controller.js @@ -7,15 +7,15 @@ @module Discourse **/ Discourse.TopicAdminMenuController = Discourse.ObjectController.extend({ - visible: false, + menuVisible: false, needs: ['modal'], show: function() { - this.set('visible', true); + this.set('menuVisible', true); }, hide: function() { - this.set('visible', false); + this.set('menuVisible', false); } }); diff --git a/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars b/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars index 3a7fe1bb057..fe88adc262c 100644 --- a/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars +++ b/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars @@ -1,4 +1,4 @@ -{{#if visible}} +{{#if menuVisible}}

{{i18n admin_title}}