Revert use of options && other combo-box cleanups
Dieser Commit ist enthalten in:
Ursprung
e293a3f5e9
Commit
1b3dd5a6ba
8 geänderte Dateien mit 18 neuen und 71 gelöschten Zeilen
|
@ -111,9 +111,7 @@
|
|||
content=model.themes
|
||||
valueProperty='id'
|
||||
value=model.theme_id
|
||||
options=(hash
|
||||
none='admin.wizard.no_theme'
|
||||
)}}
|
||||
none='admin.wizard.no_theme'}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -92,9 +92,7 @@
|
|||
{{combo-box
|
||||
value=api.authType
|
||||
content=authorizationTypes
|
||||
options=(hash
|
||||
none='admin.wizard.api.auth.type_none'
|
||||
)}}
|
||||
none='admin.wizard.api.auth.type_none'}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -248,21 +246,15 @@
|
|||
{{combo-box
|
||||
content=endpointMethods
|
||||
value=endpoint.method
|
||||
options=(hash
|
||||
none="admin.wizard.api.endpoint.method"
|
||||
)}}
|
||||
none="admin.wizard.api.endpoint.method"}}
|
||||
{{combo-box
|
||||
content=contentTypes
|
||||
value=endpoint.content_type
|
||||
options=(hash
|
||||
none="admin.wizard.api.endpoint.content_type"
|
||||
)}}
|
||||
none="admin.wizard.api.endpoint.content_type"}}
|
||||
{{multi-select
|
||||
content=successCodes
|
||||
values=endpoint.success_codes
|
||||
options=(hash
|
||||
none="admin.wizard.api.endpoint.success_codes"
|
||||
)}}
|
||||
none="admin.wizard.api.endpoint.success_codes"}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -15,9 +15,7 @@
|
|||
{{combo-box
|
||||
value=action.type
|
||||
content=types
|
||||
options=(hash
|
||||
none="admin.wizard.field.type"
|
||||
)}}
|
||||
none="admin.wizard.field.type"}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -32,9 +30,7 @@
|
|||
content=availableFields
|
||||
nameProperty="label"
|
||||
isDisabled=action.custom_title_enabled
|
||||
options=(hash
|
||||
none='admin.wizard.select_field'
|
||||
)}}
|
||||
none='admin.wizard.select_field'}}
|
||||
<div class="setting-gutter">
|
||||
{{input type='checkbox' checked=action.custom_title_enabled}}
|
||||
<span>{{i18n 'admin.wizard.action.custom_title'}}</span>
|
||||
|
@ -55,9 +51,7 @@
|
|||
content=availableFields
|
||||
nameProperty='label'
|
||||
isDisabled=action.post_builder
|
||||
options=(hash
|
||||
none='admin.wizard.select_field'
|
||||
)}}
|
||||
none='admin.wizard.select_field'}}
|
||||
<div class="setting-gutter">
|
||||
{{input type='checkbox' checked=action.post_builder}}
|
||||
<span>{{i18n 'admin.wizard.action.post_builder.checkbox'}}</span>
|
||||
|
@ -105,9 +99,7 @@
|
|||
value=action.category_id
|
||||
content=categoryFields
|
||||
nameProperty="label"
|
||||
options=(hash
|
||||
none='admin.wizard.select_field'
|
||||
)}}
|
||||
none='admin.wizard.select_field'}}
|
||||
{{/if}}
|
||||
</div>
|
||||
<div>
|
||||
|
@ -142,9 +134,7 @@
|
|||
value=action.custom_tag_field
|
||||
content=tagFields
|
||||
nameProperty="label"
|
||||
options=(hash
|
||||
none='admin.wizard.select_field'
|
||||
)}}
|
||||
none='admin.wizard.select_field'}}
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
@ -185,9 +175,7 @@
|
|||
value=action.required
|
||||
content=availableFields
|
||||
nameProperty='label'
|
||||
options=(hash
|
||||
none='admin.wizard.select_field'
|
||||
)}}
|
||||
none='admin.wizard.select_field'}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="setting">
|
||||
|
@ -232,9 +220,7 @@
|
|||
value=action.api
|
||||
content=availableApis
|
||||
isDisabled=action.custom_title_enabled
|
||||
options=(hash
|
||||
none='admin.wizard.action.send_to_api.select_an_api'
|
||||
)}}
|
||||
none='admin.wizard.action.send_to_api.select_an_api'}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -247,9 +233,7 @@
|
|||
value=action.api_endpoint
|
||||
content=availableEndpoints
|
||||
isDisabled=apiEmpty
|
||||
options=(hash
|
||||
none='admin.wizard.action.send_to_api.select_an_endpoint'
|
||||
)}}
|
||||
none='admin.wizard.action.send_to_api.select_an_endpoint'}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -277,9 +261,7 @@
|
|||
content=availableFields
|
||||
isDisabled=action.custom_group_enabled
|
||||
nameProperty="label"
|
||||
options=(hash
|
||||
none='admin.wizard.select_field'
|
||||
)}}
|
||||
none='admin.wizard.select_field'}}
|
||||
<div class="setting-gutter">
|
||||
{{input type='checkbox' checked=action.custom_group_enabled}}
|
||||
<span>{{i18n 'admin.wizard.action.add_to_group.custom_group'}}</span>
|
||||
|
|
|
@ -51,9 +51,7 @@
|
|||
{{combo-box
|
||||
value=field.type
|
||||
content=types
|
||||
options=(hash
|
||||
none="admin.wizard.field.type"
|
||||
)}}
|
||||
none="admin.wizard.field.type"}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -87,9 +85,7 @@
|
|||
{{combo-box
|
||||
value=field.choices_type
|
||||
content=choicesTypes
|
||||
options=(hash
|
||||
none="admin.wizard.field.choices_type"
|
||||
)}}
|
||||
none="admin.wizard.field.choices_type"}}
|
||||
|
||||
{{#if choicesTranslation}}
|
||||
<div class="wizard-header small">
|
||||
|
@ -105,9 +101,7 @@
|
|||
{{combo-box
|
||||
value=field.choices_preset
|
||||
content=presetChoices
|
||||
options=(hash
|
||||
none='admin.wizard.none'
|
||||
)}}
|
||||
none='admin.wizard.none'}}
|
||||
<div class="wizard-header small">
|
||||
{{i18n 'admin.wizard.field.choices_preset.filter'}}
|
||||
</div>
|
||||
|
|
|
@ -64,15 +64,6 @@ export default ComposerEditor.extend({
|
|||
sendAction: this.showUploadModal
|
||||
});
|
||||
}
|
||||
|
||||
toolbar.addButton({
|
||||
id: "options",
|
||||
group: "extras",
|
||||
icon: "cog",
|
||||
title: "composer.options",
|
||||
sendAction: this.onExpandPopupMenuOptions.bind(this),
|
||||
popupMenu: true
|
||||
});
|
||||
}
|
||||
}
|
||||
})
|
|
@ -30,15 +30,11 @@ export default Ember.Component.extend({
|
|||
groupsMentioned() {
|
||||
},
|
||||
afterRefresh() {
|
||||
},
|
||||
storeToolbarState() {
|
||||
},
|
||||
},
|
||||
cannotSeeMention() {
|
||||
},
|
||||
importQuote() {
|
||||
},
|
||||
onPopupMenuAction() {
|
||||
},
|
||||
showUploadSelector() {
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,8 +12,5 @@
|
|||
loading=composer.loading
|
||||
showLink=showLink
|
||||
composerEvents=true
|
||||
onExpandPopupMenuOptions=(action "onExpandPopupMenuOptions")
|
||||
onPopupMenuAction=onPopupMenuAction
|
||||
popupMenuOptions=popupMenuOptions
|
||||
disabled=disableTextarea
|
||||
outletArgs=(hash composer=composer editorType="composer")}}
|
|
@ -1,8 +1,5 @@
|
|||
{{wizard-composer-editor replyPlaceholder=field.placeholder
|
||||
composer=composer
|
||||
storeToolbarState=(action "storeToolbarState")
|
||||
onPopupMenuAction=(action "onPopupMenuAction")
|
||||
showUploadModal=(action "showUploadSelector")
|
||||
groupsMentioned=(action "groupsMentioned")
|
||||
cannotSeeMention=(action "cannotSeeMention")
|
||||
importQuote=(action "importQuote")
|
||||
|
|
Laden …
In neuem Issue referenzieren