diff options
| author | matthew <matthew> | 2008-04-03 17:06:20 +0000 |
|---|---|---|
| committer | matthew <matthew> | 2008-04-03 17:06:20 +0000 |
| commit | 6934be59ed3d44fdde86cefdaef47ad2556e59a9 (patch) | |
| tree | dc5beaacfc90d544417e7f60d9910c039db9e51e | |
| parent | ef85f916aa01da3695fe28233c3aede4d4dc015d (diff) | |
Error handlers for SWF uploading; but switch it off for now.
| -rw-r--r-- | perllib/Page.pm | 6 | ||||
| -rw-r--r-- | web/js.js | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/perllib/Page.pm b/perllib/Page.pm index dd6e29e7d..0d3d46a6d 100644 --- a/perllib/Page.pm +++ b/perllib/Page.pm @@ -6,7 +6,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: Page.pm,v 1.85 2008-04-03 16:18:37 matthew Exp $ +# $Id: Page.pm,v 1.86 2008-04-03 17:06:20 matthew Exp $ # package Page; @@ -108,9 +108,12 @@ sub header ($%) { <html lang="en-gb"> <head> <script type="text/javascript" src="/yui/utilities.js"></script> +<!-- <script type="text/javascript" src="/jslib/swfupload/swfupload.js"></script> <script type="text/javascript" src="/jslib/swfupload/FileProgress.js"></script> <script type="text/javascript" src="/jslib/swfupload/swfupload.graceful_degradation.js"></script> + <script type="text/javascript" src="/jslib/swfupload/swfupload_handlers.js"></script> +--> <script type="text/javascript" src="/js.js"></script> <title>${title}FixMyStreet</title> <style type="text/css">\@import url("/css/core.css"); \@import url("/css/main.css");</style> @@ -139,6 +142,7 @@ sub footer { my ($q, %params) = @_; my $extra = $params{extra}; my $js = $params{js} || ''; + $js = ''; # Don't use fileupload JS at the moment if ($q->{site} eq 'scambs') { open FP, '../templates/website/scambs-footer'; @@ -115,6 +115,7 @@ YAHOO.util.Event.onContentReady('email_alert_box', function() { }); /* File upload */ +/* function doSubmit(e) { e = e || window.event; if (e.stopPropagation) e.stopPropagation(); @@ -153,8 +154,7 @@ var swfu_settings = { file_queued_handler : function(obj) { document.getElementById('txtfilename').value = obj.name; }, -//file_queue_error_handler : fileQueueError, - // file_dialog_complete_handler : fileDialogComplete, + file_queue_error_handler : fileQueueError, //upload_start_handler : uploadStartEventHandler, upload_progress_handler : function(obj, bytesLoaded, bytesTotal) { var percent = Math.ceil((bytesLoaded / bytesTotal) * 100); @@ -189,7 +189,7 @@ var swfu_settings = { } }, -//upload_error_handler : uploadError, + upload_error_handler : uploadError, swfupload_element_id : "fileupload_flashUI", degraded_element_id : "fileupload_normalUI", @@ -198,6 +198,7 @@ var swfu_settings = { progress_target : 'fileupload_flashUI' } }; +*/ // I love the global var tile_x = 0; |