Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use .dcstylejson instead of .dcstyle.json

This commit is contained in:
riking 2015-05-16 20:33:31 -07:00
parent 291d9fc65e
commit fbc06d044f
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/components/json-file-uploader.js.es6
View File

@ -32,6 +32,10 @@ export default Em.Component.extend({
}.on('didInsertElement'), }.on('didInsertElement'),
accept: function() {
return ".json,application/json" + (this.get('extension') ? "," + this.get('extension') : "");
}.property('extension'),
setReady: function() { setReady: function() {
let parsed; let parsed;
try { try {

2
app/assets/javascripts/discourse/templates/components/json-file-uploader.hbs
View File

@ -1,5 +1,5 @@
<div class="jsfu-file"> <div class="jsfu-file">
<input id="js-file-input" type="file" style="display:none;" accept=".json,application/json"> <input id="js-file-input" type="file" style="display:none;" accept={{accept}}>
{{d-button class="fileSelect" action="selectFile" class="" icon="upload" label="upload_selector.select_file"}} {{d-button class="fileSelect" action="selectFile" class="" icon="upload" label="upload_selector.select_file"}}
{{conditional-loading-spinner condition=loading size="small"}} {{conditional-loading-spinner condition=loading size="small"}}
</div> </div>

2
app/assets/javascripts/discourse/templates/modal/upload-customization.hbs
View File

@ -1,6 +1,6 @@
<form {{action "dummy" on="submit"}}> <form {{action "dummy" on="submit"}}>
<div class='modal-body'> <div class='modal-body'>
{{json-file-uploader value=customizationFile}} {{json-file-uploader value=customizationFile extension=".dcstylejson"}}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
{{d-button class='btn-primary' action='createCustomization' type='submit' disabled=notReady icon="plus" label='admin.customize.import'}} {{d-button class='btn-primary' action='createCustomization' type='submit' disabled=notReady icon="plus" label='admin.customize.import'}}

2
app/controllers/admin/site_customizations_controller.rb
View File

@ -62,7 +62,7 @@ class Admin::SiteCustomizationsController < Admin::AdminController
format.any(:html, :text) do format.any(:html, :text) do
raise RenderEmpty.new if request.xhr? raise RenderEmpty.new if request.xhr?
response.headers['Content-Disposition'] = "attachment; filename=#{@site_customization.name.parameterize}.dcstyle.json" response.headers['Content-Disposition'] = "attachment; filename=#{@site_customization.name.parameterize}.dcstylejson"
response.sending_file = true response.sending_file = true
render json: SiteCustomizationSerializer.new(@site_customization) render json: SiteCustomizationSerializer.new(@site_customization)
end end