less poluting method of variable scoping

This commit is contained in:
Dave Cranwell 2014-10-08 14:17:58 +01:00 committed by Karl Hobley
parent 9b47343e2a
commit 140855c03c
2 changed files with 14 additions and 10 deletions

View file

@ -1,7 +1,7 @@
$(function(){
// Redirect users that don't support filereader
if(!$('html').hasClass('filereader')){
document.location.href = window.simple_upload_url;
document.location.href = window.fileupload_opts.simple_upload_url;
return false;
}
@ -14,15 +14,15 @@ $(function(){
dataType: 'html',
sequentialUploads: true,
dropZone: $('.drop-zone'),
acceptFileTypes: window.accepted_file_types,
maxFileSize: window.max_file_size,
acceptFileTypes: window.fileupload_opts.accepted_file_types,
maxFileSize: window.fileupload_opts.max_file_size,
previewMinWidth:150,
previewMaxWidth:150,
previewMinHeight:150,
previewMaxHeight:150,
messages: {
acceptFileTypes: window.message_accepted_file_types,
maxFileSize: window.messages_max_filesize
acceptFileTypes: window.fileupload_opts.messages.accepted_file_types,
maxFileSize: window.fileupload_opts.messages.max_file_size
},
add: function (e, data) {
var $this = $(this);

View file

@ -70,11 +70,15 @@
{% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
<script>
window.accepted_file_types = /(\.|\/)(gif|jpe?g|png)$/i; //must be regex
window.message_max_filesize = "max filesize message";
window.message_accepted_file_types = "filetypes message";
window.max_file_size = {{ max_filesize }}; //numeric format
window.simple_upload_url = "{% url 'wagtailimages_add_image' %}";
window.fileupload_opts = {
simple_upload_url: "{% url 'wagtailimages_add_image' %}",
accepted_file_types: /(\.|\/)(gif|jpe?g|png)$/i, //must be regex
max_file_size: {{ max_filesize }}, //numeric format
messages: {
max_file_size: "max filesize message",
accepted_file_types: "filetypes message"
}
}
window.tagit_opts = {
autocomplete: {source: "{{ autocomplete_url|addslashes }}"}
};