1
0
Fork 0

Revert use of options && other combo-box cleanups

Dieser Commit ist enthalten in:
Angus McLeod 2020-02-05 17:58:35 +11:00
Ursprung e293a3f5e9
Commit 1b3dd5a6ba
8 geänderte Dateien mit 18 neuen und 71 gelöschten Zeilen

Datei anzeigen

@ -111,9 +111,7 @@
content=model.themes content=model.themes
valueProperty='id' valueProperty='id'
value=model.theme_id value=model.theme_id
options=(hash none='admin.wizard.no_theme'}}
none='admin.wizard.no_theme'
)}}
</div> </div>
</div> </div>

Datei anzeigen

@ -92,9 +92,7 @@
{{combo-box {{combo-box
value=api.authType value=api.authType
content=authorizationTypes content=authorizationTypes
options=(hash none='admin.wizard.api.auth.type_none'}}
none='admin.wizard.api.auth.type_none'
)}}
</div> </div>
</div> </div>
@ -248,21 +246,15 @@
{{combo-box {{combo-box
content=endpointMethods content=endpointMethods
value=endpoint.method value=endpoint.method
options=(hash none="admin.wizard.api.endpoint.method"}}
none="admin.wizard.api.endpoint.method"
)}}
{{combo-box {{combo-box
content=contentTypes content=contentTypes
value=endpoint.content_type value=endpoint.content_type
options=(hash none="admin.wizard.api.endpoint.content_type"}}
none="admin.wizard.api.endpoint.content_type"
)}}
{{multi-select {{multi-select
content=successCodes content=successCodes
values=endpoint.success_codes values=endpoint.success_codes
options=(hash none="admin.wizard.api.endpoint.success_codes"}}
none="admin.wizard.api.endpoint.success_codes"
)}}
</div> </div>
</div> </div>
</div> </div>

Datei anzeigen

@ -15,9 +15,7 @@
{{combo-box {{combo-box
value=action.type value=action.type
content=types content=types
options=(hash none="admin.wizard.field.type"}}
none="admin.wizard.field.type"
)}}
</div> </div>
</div> </div>
@ -32,9 +30,7 @@
content=availableFields content=availableFields
nameProperty="label" nameProperty="label"
isDisabled=action.custom_title_enabled isDisabled=action.custom_title_enabled
options=(hash none='admin.wizard.select_field'}}
none='admin.wizard.select_field'
)}}
<div class="setting-gutter"> <div class="setting-gutter">
{{input type='checkbox' checked=action.custom_title_enabled}} {{input type='checkbox' checked=action.custom_title_enabled}}
<span>{{i18n 'admin.wizard.action.custom_title'}}</span> <span>{{i18n 'admin.wizard.action.custom_title'}}</span>
@ -55,9 +51,7 @@
content=availableFields content=availableFields
nameProperty='label' nameProperty='label'
isDisabled=action.post_builder isDisabled=action.post_builder
options=(hash none='admin.wizard.select_field'}}
none='admin.wizard.select_field'
)}}
<div class="setting-gutter"> <div class="setting-gutter">
{{input type='checkbox' checked=action.post_builder}} {{input type='checkbox' checked=action.post_builder}}
<span>{{i18n 'admin.wizard.action.post_builder.checkbox'}}</span> <span>{{i18n 'admin.wizard.action.post_builder.checkbox'}}</span>
@ -105,9 +99,7 @@
value=action.category_id value=action.category_id
content=categoryFields content=categoryFields
nameProperty="label" nameProperty="label"
options=(hash none='admin.wizard.select_field'}}
none='admin.wizard.select_field'
)}}
{{/if}} {{/if}}
</div> </div>
<div> <div>
@ -142,9 +134,7 @@
value=action.custom_tag_field value=action.custom_tag_field
content=tagFields content=tagFields
nameProperty="label" nameProperty="label"
options=(hash none='admin.wizard.select_field'}}
none='admin.wizard.select_field'
)}}
</div> </div>
{{/if}} {{/if}}
</div> </div>
@ -185,9 +175,7 @@
value=action.required value=action.required
content=availableFields content=availableFields
nameProperty='label' nameProperty='label'
options=(hash none='admin.wizard.select_field'}}
none='admin.wizard.select_field'
)}}
</div> </div>
</div> </div>
<div class="setting"> <div class="setting">
@ -232,9 +220,7 @@
value=action.api value=action.api
content=availableApis content=availableApis
isDisabled=action.custom_title_enabled 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>
</div> </div>
@ -247,9 +233,7 @@
value=action.api_endpoint value=action.api_endpoint
content=availableEndpoints content=availableEndpoints
isDisabled=apiEmpty 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>
</div> </div>
@ -277,9 +261,7 @@
content=availableFields content=availableFields
isDisabled=action.custom_group_enabled isDisabled=action.custom_group_enabled
nameProperty="label" nameProperty="label"
options=(hash none='admin.wizard.select_field'}}
none='admin.wizard.select_field'
)}}
<div class="setting-gutter"> <div class="setting-gutter">
{{input type='checkbox' checked=action.custom_group_enabled}} {{input type='checkbox' checked=action.custom_group_enabled}}
<span>{{i18n 'admin.wizard.action.add_to_group.custom_group'}}</span> <span>{{i18n 'admin.wizard.action.add_to_group.custom_group'}}</span>

Datei anzeigen

@ -51,9 +51,7 @@
{{combo-box {{combo-box
value=field.type value=field.type
content=types content=types
options=(hash none="admin.wizard.field.type"}}
none="admin.wizard.field.type"
)}}
</div> </div>
</div> </div>
@ -87,9 +85,7 @@
{{combo-box {{combo-box
value=field.choices_type value=field.choices_type
content=choicesTypes content=choicesTypes
options=(hash none="admin.wizard.field.choices_type"}}
none="admin.wizard.field.choices_type"
)}}
{{#if choicesTranslation}} {{#if choicesTranslation}}
<div class="wizard-header small"> <div class="wizard-header small">
@ -105,9 +101,7 @@
{{combo-box {{combo-box
value=field.choices_preset value=field.choices_preset
content=presetChoices content=presetChoices
options=(hash none='admin.wizard.none'}}
none='admin.wizard.none'
)}}
<div class="wizard-header small"> <div class="wizard-header small">
{{i18n 'admin.wizard.field.choices_preset.filter'}} {{i18n 'admin.wizard.field.choices_preset.filter'}}
</div> </div>

Datei anzeigen

@ -64,15 +64,6 @@ export default ComposerEditor.extend({
sendAction: this.showUploadModal sendAction: this.showUploadModal
}); });
} }
toolbar.addButton({
id: "options",
group: "extras",
icon: "cog",
title: "composer.options",
sendAction: this.onExpandPopupMenuOptions.bind(this),
popupMenu: true
});
} }
} }
}) })

Datei anzeigen

@ -31,14 +31,10 @@ export default Ember.Component.extend({
}, },
afterRefresh() { afterRefresh() {
}, },
storeToolbarState() {
},
cannotSeeMention() { cannotSeeMention() {
}, },
importQuote() { importQuote() {
}, },
onPopupMenuAction() {
},
showUploadSelector() { showUploadSelector() {
} }
} }

Datei anzeigen

@ -12,8 +12,5 @@
loading=composer.loading loading=composer.loading
showLink=showLink showLink=showLink
composerEvents=true composerEvents=true
onExpandPopupMenuOptions=(action "onExpandPopupMenuOptions")
onPopupMenuAction=onPopupMenuAction
popupMenuOptions=popupMenuOptions
disabled=disableTextarea disabled=disableTextarea
outletArgs=(hash composer=composer editorType="composer")}} outletArgs=(hash composer=composer editorType="composer")}}

Datei anzeigen

@ -1,8 +1,5 @@
{{wizard-composer-editor replyPlaceholder=field.placeholder {{wizard-composer-editor replyPlaceholder=field.placeholder
composer=composer composer=composer
storeToolbarState=(action "storeToolbarState")
onPopupMenuAction=(action "onPopupMenuAction")
showUploadModal=(action "showUploadSelector")
groupsMentioned=(action "groupsMentioned") groupsMentioned=(action "groupsMentioned")
cannotSeeMention=(action "cannotSeeMention") cannotSeeMention=(action "cannotSeeMention")
importQuote=(action "importQuote") importQuote=(action "importQuote")