PDF textbooks only accept PDF files
All other file types will trigger a validation error
This commit is contained in:
@@ -133,3 +133,26 @@ describe "CMS.Collections.ChapterSet", ->
|
||||
# try going back one
|
||||
@collection.remove(@collection.last())
|
||||
expect(@collection.nextOrder()).toEqual(2)
|
||||
|
||||
|
||||
describe "CMS.Models.FileUpload", ->
|
||||
beforeEach ->
|
||||
@model = new CMS.Models.FileUpload()
|
||||
|
||||
it "is valid by default", ->
|
||||
expect(@model.isValid()).toBeTruthy()
|
||||
|
||||
it "is valid for PDF files", ->
|
||||
file = {"type": "application/pdf"}
|
||||
@model.set("selectedFile", file);
|
||||
expect(@model.isValid()).toBeTruthy()
|
||||
|
||||
it "is invalid for text files", ->
|
||||
file = {"type": "text/plain"}
|
||||
@model.set("selectedFile", file);
|
||||
expect(@model.isValid()).toBeFalsy()
|
||||
|
||||
it "is invalid for PNG files", ->
|
||||
file = {"type": "image/png"}
|
||||
@model.set("selectedFile", file);
|
||||
expect(@model.isValid()).toBeFalsy()
|
||||
|
||||
@@ -230,12 +230,25 @@ describe "CMS.Views.UploadDialog", ->
|
||||
expect(@view.$el).toContain("input[type=file]")
|
||||
expect(@view.$(".action-upload")).toBeDisabled()
|
||||
|
||||
it "should render with a file selected", ->
|
||||
@mockFiles.push({name: "fake.pdf"})
|
||||
it "should render with a PDF selected", ->
|
||||
file = {name: "fake.pdf", "type": "application/pdf"}
|
||||
@mockFiles.push(file)
|
||||
@model.set("selectedFile", file)
|
||||
@view.render()
|
||||
expect(@view.$el).toContain("input[type=file]")
|
||||
expect(@view.$el).not.toContain("p.error")
|
||||
expect(@view.$(".action-upload")).not.toBeDisabled()
|
||||
|
||||
it "should render an error with an invalid file type selected", ->
|
||||
file = {name: "fake.png", "type": "image/png"}
|
||||
@mockFiles.push(file)
|
||||
@model.set("selectedFile", file)
|
||||
@view.render()
|
||||
expect(@view.$el).toContain("input[type=file]")
|
||||
expect(@view.$el).toContain("p.error")
|
||||
expect(@view.$(".action-upload")).toBeDisabled()
|
||||
|
||||
|
||||
it "adds body class on show()", ->
|
||||
@view.show()
|
||||
expect(@view.options.shown).toBeTruthy()
|
||||
|
||||
@@ -94,9 +94,14 @@ CMS.Models.FileUpload = Backbone.Model.extend({
|
||||
defaults: {
|
||||
"title": "",
|
||||
"message": "",
|
||||
"selectFile": null,
|
||||
"selectedFile": null,
|
||||
"uploading": false,
|
||||
"uploadedBytes": 0,
|
||||
"totalBytes": 0
|
||||
},
|
||||
validate: function(attrs, options) {
|
||||
if(attrs.selectedFile && attrs.selectedFile.type !== "application/pdf") {
|
||||
return gettext("Only PDF files can be uploaded");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -233,18 +233,12 @@ CMS.Views.UploadDialog = Backbone.View.extend({
|
||||
initialize: function() {
|
||||
this.template = _.template($("#upload-dialog-tpl").text());
|
||||
this.listenTo(this.model, "change", this.render);
|
||||
this.listenTo(this.model, "invalid", this.handleInvalid);
|
||||
},
|
||||
render: function() {
|
||||
// some browsers (like Chrome) allow you to assign to the .files attribute
|
||||
// of an <input type="file"> DOM element -- for those browsers, we can
|
||||
// create a new DOM element and assign the old content to it. Other browsers
|
||||
// (like Firefox) make this attribute read-only, and we have to save the
|
||||
// old DOM element in order to save it's content. For compatibility purposes,
|
||||
// we'll just save the old element every time.
|
||||
var oldInput = this.$("input[type=file]").get(0), selectedFile;
|
||||
if (oldInput && oldInput.files.length) {
|
||||
selectedFile = oldInput.files[0];
|
||||
}
|
||||
if(!this.model.isValid()) {return this;}
|
||||
var selectedFile = this.model.get('selectedFile');
|
||||
var oldInput = this.$("input[type=file]").get(0);
|
||||
this.$el.html(this.template({
|
||||
shown: this.options.shown,
|
||||
url: UPLOAD_ASSET_CALLBACK_URL,
|
||||
@@ -253,12 +247,17 @@ CMS.Views.UploadDialog = Backbone.View.extend({
|
||||
selectedFile: selectedFile,
|
||||
uploading: this.model.get('uploading'),
|
||||
uploadedBytes: this.model.get('uploadedBytes'),
|
||||
totalBytes: this.model.get('totalBytes')
|
||||
totalBytes: this.model.get('totalBytes'),
|
||||
error: this.model.get('error')
|
||||
}));
|
||||
if (oldInput) {
|
||||
// ideally, we'd like to tell the browser to pre-populate the
|
||||
// <input type="file"> with the selectedFile if we have one -- but
|
||||
// browser security prohibits that. So instead, we'll swap out the
|
||||
// new input (that has no file selected) with the old input (that
|
||||
// already has the selectedFile selected).
|
||||
if (selectedFile) {
|
||||
this.$('input[type=file]').replaceWith(oldInput);
|
||||
}
|
||||
|
||||
return this;
|
||||
},
|
||||
events: {
|
||||
@@ -267,7 +266,10 @@ CMS.Views.UploadDialog = Backbone.View.extend({
|
||||
"click .action-upload": "upload"
|
||||
},
|
||||
selectFile: function(e) {
|
||||
this.model.set('fileList', e.target.files);
|
||||
this.model.set({
|
||||
selectedFile: e.target.files[0] || null,
|
||||
error: null
|
||||
});
|
||||
},
|
||||
show: function(e) {
|
||||
if(e && e.preventDefault) { e.preventDefault(); }
|
||||
@@ -285,6 +287,12 @@ CMS.Views.UploadDialog = Backbone.View.extend({
|
||||
if(e && e.preventDefault) { e.preventDefault(); }
|
||||
return this.hide().remove();
|
||||
},
|
||||
handleInvalid: function(model, error, options) {
|
||||
model.set({
|
||||
selectedFile: null,
|
||||
error: error
|
||||
});
|
||||
},
|
||||
upload: function(e) {
|
||||
this.model.set('uploading', true);
|
||||
this.$("form").ajaxSubmit({
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<h2 class="title"><%= title %></h2>
|
||||
<p id="dialog-assetupload-description" class="message"><%= message %></p>
|
||||
<input type="file" name="file" />
|
||||
<% if(error) {%><p class="error"><%= error %></p><% } %>
|
||||
|
||||
<% if(uploading) { %>
|
||||
<% if (uploadedBytes && totalBytes) { %>
|
||||
|
||||
Reference in New Issue
Block a user