Skip to content

Fix manager fix uploads #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 15, 2022
Merged

Fix manager fix uploads #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eae5fbb
FIX: try using new component style
angusmcleod Aug 15, 2022
cfe563e
FIX: use native javascript instead of jquery
angusmcleod Aug 15, 2022
1f25473
version bump
angusmcleod Aug 15, 2022
8168003
Apply prettier
angusmcleod Aug 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions assets/javascripts/discourse/controllers/admin-wizards-manager.js.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default Controller.extend({
file: null,
filename: null,
});
$("#file-upload").val("");
document.getElementById("custom-wizard-file-upload").value = "";
},

@observes("importing", "destroying")
Expand All @@ -83,7 +83,7 @@ export default Controller.extend({

actions: {
upload() {
$("#file-upload").click();
document.getElementById("custom-wizard-file-upload").click();
},

clearFile() {
Expand All @@ -102,7 +102,7 @@ export default Controller.extend({
if (maxFileSize < file.size) {
this.setMessage("error", "file_size_error");
this.set("file", null);
$("#file-upload").val("");
document.getElementById("custom-wizard-file-upload").value = "";
} else {
this.setProperties({
file,
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/discourse/templates/admin-wizards-manager.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{{/if}}

{{input
id="file-upload"
id="custom-wizard-file-upload"
type="file"
accept="application/json"
input=(action "setFile")}}
Expand Down
2 changes: 1 addition & 1 deletion assets/stylesheets/common/wizard-manager.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}
}

#file-upload {
#custom-wizard-file-upload {
display: none;
}

Expand Down
2 changes: 1 addition & 1 deletion plugin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true
# name: discourse-custom-wizard
# about: Create custom wizards
# version: 1.22.4
# version: 1.22.5
# authors: Angus McLeod, Faizaan Gagan, Robert Barrow, Keegan George
# url: https://github.com/paviliondev/discourse-custom-wizard
# contact_emails: development@pavilion.tech
Expand Down