github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 01:56:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Code style improvements following review

Browse Source 
Followup to 05ee1d1aba3d1238867b59d91b72327688358439
This commit is contained in:
David Taylor
2019-02-19 20:02:29 +00:00
parent 34b2157b8c
commit dbcf05d62c
3 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/admin/components/admin-theme-editor.js.es6
View File

@ -1,4 +1,5 @@
import { default as computed } from "ember-addons/ember-computed-decorators"; import { default as computed } from "ember-addons/ember-computed-decorators";
import { fmt } from "discourse/lib/computed";
export default Ember.Component.extend({ export default Ember.Component.extend({
@computed("theme.targets", "onlyOverridden", "showAdvanced") @computed("theme.targets", "onlyOverridden", "showAdvanced")
@ -40,10 +41,7 @@ export default Ember.Component.extend({
} }
}, },
@computed("fieldName", "currentTargetName") editorId: fmt("fieldName", "currentTargetName", "%@|%@"),
editorId(fieldName, currentTarget) {
return fieldName + "|" + currentTarget;
},
@computed("maximized") @computed("maximized")
maximizeIcon(maximized) { maximizeIcon(maximized) {
@ -77,16 +75,13 @@ export default Ember.Component.extend({
if (!name) return; if (!name) return;
name = name.replace(/\W/g, ""); name = name.replace(/\W/g, "");
this.get("theme").setField(this.get("currentTargetName"), name, ""); this.get("theme").setField(this.get("currentTargetName"), name, "");
this.set("newFieldName", ""); this.setProperties({ newFieldName: "", addingField: false });
this.set("addingField", false);
this.fieldAdded(this.get("currentTargetName"), name); this.fieldAdded(this.get("currentTargetName"), name);
}, },
toggleMaximize: function() { toggleMaximize: function() {
this.toggleProperty("maximized"); this.toggleProperty("maximized");
Ember.run.next(() => { Ember.run.next(() => this.appEvents.trigger("ace:resize"));
this.appEvents.trigger("ace:resize");
});
}, },
onlyOverriddenChanged(value) { onlyOverriddenChanged(value) {

4
app/assets/javascripts/admin/models/theme.js.es6
View File

@ -154,9 +154,7 @@ const Theme = RestModel.extend({
hasError(target, name) { hasError(target, name) {
return this.get("theme_fields") return this.get("theme_fields")
.filter(f => { .filter(f => f.target === target && (!name || name === f.name))
return f.target === target && (!name || name === f.name);
})
.any(f => f.error); .any(f => f.error);
}, },

18
app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
View File

@ -4,12 +4,12 @@
{{#each visibleTargets as |target|}} {{#each visibleTargets as |target|}}
<li> <li>
{{#link-to editRouteName {{#link-to editRouteName
theme.id theme.id
target.name target.name
fieldName fieldName
replace=true replace=true
title=field.title title=field.title
class=(if target.edited 'edited' 'blank') class=(if target.edited 'edited' 'blank')
}} }}
{{#if target.error}}{{d-icon 'exclamation-triangle'}}{{/if}} {{#if target.error}}{{d-icon 'exclamation-triangle'}}{{/if}}
{{#if target.icon}} {{#if target.icon}}
@ -24,11 +24,7 @@
class='no-text' class='no-text'
title="{{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}" title="{{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}"
> >
{{#if showAdvanced}} {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}}
{{d-icon "angle-double-left"}}
{{else}}
{{d-icon "angle-double-right"}}
{{/if}}
</a> </a>
</li> </li>
<li class="spacer"></li> <li class="spacer"></li>