Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 13

FIX: validates 'ThemeField' name when used in a SCSS variable

Browse source
This commit is contained in:
Régis Hanol 2017-12-19 16:10:44 +01:00
parent ca8e4dfb43
commit 24e89b6b38
3 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/assets/javascripts/admin/controllers/modals/admin-add-upload.js.es6
View file

@ -16,16 +16,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
@computed('name')
nameValid(name) {
return name && name.match(/^[a-zA-Z0-9-_]+$/);
return name && name.match(/\A[a-z_][a-z0-9_-]*\z/i);
},
@observes('name')
uploadChanged(){
let file = $('#file-input')[0];
uploadChanged() {
const file = $('#file-input')[0];
this.set('fileSelected', file && file.files[0]);
},
actions: {
updateName() {
let name = this.get('name');
if (Em.isEmpty(name)) {
@ -34,20 +35,21 @@ export default Ember.Controller.extend(ModalFunctionality, {
}
this.uploadChanged();
},
upload() {
let options = {
type: 'POST'
upload() {
const file = $('#file-input')[0].files[0];
const options = {
type: 'POST',
processData: false,
contentType: false,
data: new FormData()
};
options.processData = false;
options.contentType = false;
options.data = new FormData();
let file = $('#file-input')[0].files[0];
options.data.append('file', file);
ajax('/admin/themes/upload_asset', options).then(result=>{
let upload = {
ajax('/admin/themes/upload_asset', options).then(result => {
const upload = {
upload_id: result.upload_id,
name: this.get('name'),
original_filename: file.name
@ -57,7 +59,6 @@ export default Ember.Controller.extend(ModalFunctionality, {
}).catch(e => {
popupAjaxError(e);
});
}
}
});