-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FEATURE: Added settings/translations support to theme editor UI (#7026)
- These advanced fields are hidden behind an 'advanced' button, so will not affect normal use - The editor has been refactored into a component, and styling cleaned up so menu items do not overlap on small screens - Styling has been added to indicate which fields are in use for a theme - Icons have been added to identify which fields have errors
- Loading branch information
1 parent
0616837
commit 05ee1d1
Showing
9 changed files
with
375 additions
and
248 deletions.
There are no files selected for viewing
96 changes: 96 additions & 0 deletions
96
app/assets/javascripts/admin/components/admin-theme-editor.js.es6
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
import { default as computed } from "ember-addons/ember-computed-decorators"; | ||
|
||
export default Ember.Component.extend({ | ||
@computed("theme.targets", "onlyOverridden", "showAdvanced") | ||
visibleTargets(targets, onlyOverridden, showAdvanced) { | ||
return targets.filter(target => { | ||
if (target.advanced && !showAdvanced) { | ||
return false; | ||
} | ||
if (!onlyOverridden) { | ||
return true; | ||
} | ||
return target.edited; | ||
}); | ||
}, | ||
|
||
@computed("currentTargetName", "onlyOverridden", "theme.fields") | ||
visibleFields(targetName, onlyOverridden, fields) { | ||
fields = fields[targetName]; | ||
if (onlyOverridden) { | ||
fields = fields.filter(field => field.edited); | ||
} | ||
return fields; | ||
}, | ||
|
||
@computed("currentTargetName", "fieldName") | ||
activeSectionMode(targetName, fieldName) { | ||
if (["settings", "translations"].includes(targetName)) return "yaml"; | ||
return fieldName && fieldName.indexOf("scss") > -1 ? "scss" : "html"; | ||
}, | ||
|
||
@computed("fieldName", "currentTargetName", "theme") | ||
activeSection: { | ||
get(fieldName, target, model) { | ||
return model.getField(target, fieldName); | ||
}, | ||
set(value, fieldName, target, model) { | ||
model.setField(target, fieldName, value); | ||
return value; | ||
} | ||
}, | ||
|
||
@computed("fieldName", "currentTargetName") | ||
editorId(fieldName, currentTarget) { | ||
return fieldName + "|" + currentTarget; | ||
This comment has been minimized.
Sorry, something went wrong. |
||
}, | ||
|
||
@computed("maximized") | ||
maximizeIcon(maximized) { | ||
return maximized ? "discourse-compress" : "discourse-expand"; | ||
}, | ||
|
||
@computed("currentTargetName", "theme.targets") | ||
showAddField(currentTargetName, targets) { | ||
return targets.find(t => t.name === currentTargetName).customNames; | ||
}, | ||
|
||
@computed("currentTargetName", "fieldName", "theme.theme_fields.@each.error") | ||
error(target, fieldName) { | ||
return this.get("theme").getError(target, fieldName); | ||
}, | ||
|
||
actions: { | ||
toggleShowAdvanced() { | ||
this.toggleProperty("showAdvanced"); | ||
}, | ||
|
||
toggleAddField() { | ||
this.toggleProperty("addingField"); | ||
}, | ||
|
||
cancelAddField() { | ||
this.set("addingField", false); | ||
}, | ||
|
||
addField(name) { | ||
if (!name) return; | ||
name = name.replace(/\W/g, ""); | ||
this.get("theme").setField(this.get("currentTargetName"), name, ""); | ||
this.set("newFieldName", ""); | ||
This comment has been minimized.
Sorry, something went wrong. |
||
this.set("addingField", false); | ||
this.fieldAdded(this.get("currentTargetName"), name); | ||
}, | ||
|
||
toggleMaximize: function() { | ||
this.toggleProperty("maximized"); | ||
Ember.run.next(() => { | ||
This comment has been minimized.
Sorry, something went wrong. |
||
this.appEvents.trigger("ace:resize"); | ||
}); | ||
}, | ||
|
||
onlyOverriddenChanged(value) { | ||
this.onlyOverriddenChanged(value); | ||
} | ||
} | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
1 comment
on commit 05ee1d1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can use
fmt()
for this.