From fbc06d044ff40774620d15460e518434db847e70 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Sat, 16 May 2015 20:33:31 -0700
Subject: [PATCH] Use .dcstylejson instead of .dcstyle.json

---
 .../discourse/components/json-file-uploader.js.es6            | 4 ++++
 .../discourse/templates/components/json-file-uploader.hbs     | 2 +-
 .../discourse/templates/modal/upload-customization.hbs        | 2 +-
 app/controllers/admin/site_customizations_controller.rb       | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/json-file-uploader.js.es6 b/app/assets/javascripts/discourse/components/json-file-uploader.js.es6
index 954d5f8d2ae..250260dc483 100644
--- a/app/assets/javascripts/discourse/components/json-file-uploader.js.es6
+++ b/app/assets/javascripts/discourse/components/json-file-uploader.js.es6
@@ -32,6 +32,10 @@ export default Em.Component.extend({
 
   }.on('didInsertElement'),
 
+  accept: function() {
+    return ".json,application/json" + (this.get('extension') ? "," + this.get('extension') : "");
+  }.property('extension'),
+
   setReady: function() {
     let parsed;
     try {
diff --git a/app/assets/javascripts/discourse/templates/components/json-file-uploader.hbs b/app/assets/javascripts/discourse/templates/components/json-file-uploader.hbs
index 655e3f7340d..fba3461c547 100644
--- a/app/assets/javascripts/discourse/templates/components/json-file-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/json-file-uploader.hbs
@@ -1,5 +1,5 @@
 <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"}}
   {{conditional-loading-spinner condition=loading size="small"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs b/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs
index 8cc7851b3f3..3e49a755e5a 100644
--- a/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs
@@ -1,6 +1,6 @@
 <form {{action "dummy" on="submit"}}>
   <div class='modal-body'>
-    {{json-file-uploader value=customizationFile}}
+    {{json-file-uploader value=customizationFile extension=".dcstylejson"}}
   </div>
   <div class="modal-footer">
     {{d-button class='btn-primary' action='createCustomization' type='submit' disabled=notReady icon="plus" label='admin.customize.import'}}
diff --git a/app/controllers/admin/site_customizations_controller.rb b/app/controllers/admin/site_customizations_controller.rb
index 30929fe4e09..0eedc538c41 100644
--- a/app/controllers/admin/site_customizations_controller.rb
+++ b/app/controllers/admin/site_customizations_controller.rb
@@ -62,7 +62,7 @@ class Admin::SiteCustomizationsController < Admin::AdminController
       format.any(:html, :text) do
         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
         render json: SiteCustomizationSerializer.new(@site_customization)
       end