/[drupal]/contributions/modules/swfupload/js/swfupload.src.js
ViewVC logotype

Diff of /contributions/modules/swfupload/js/swfupload.src.js

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.1, Sat Nov 22 09:51:47 2008 UTC revision 1.2, Tue Nov 25 11:19:10 2008 UTC
# Line 493  function SWFU(id, settings) { Line 493  function SWFU(id, settings) {
493      if (ref.max_queue_size && ref.max_queue_size !== 0) {      if (ref.max_queue_size && ref.max_queue_size !== 0) {
494        // Check if the new file does not exceed the max queue size        // Check if the new file does not exceed the max queue size
495        if ((ref.upload_stack_size + file.size) > ref.max_queue_size) {        if ((ref.upload_stack_size + file.size) > ref.max_queue_size) {
496          var max_queue_mbs = ((ref.max_queue_size / 1024) / 1024);          var max_queue_mbs = ref.getMbs(ref.max_queue_size);
497          var file_mbs = ((file.size / 1024) / 1024);          var file_mbs = ((file.size / 1024) / 1024);
498          ref.swfu.cancelUpload(file.id);          ref.swfu.cancelUpload(file.id);
499          ref.displayMessage(Drupal.t('The file size (!num1 MB) exceeds the upload size (!num2 MB) for this page!', {'!num1':file_mbs.toFixed(2), '!num2':max_queue_mbs.toFixed(2)}), 'error');          ref.displayMessage(Drupal.t('The file size (!num1 MB) exceeds the upload size (!num2 MB) for this page!', {'!num1':file_mbs.toFixed(2), '!num2':max_queue_mbs.toFixed(2)}), 'error');
# Line 512  function SWFU(id, settings) { Line 512  function SWFU(id, settings) {
512    ref.fileQueueError = function(file, code, message) {    ref.fileQueueError = function(file, code, message) {
513      switch (code) {      switch (code) {
514        case -110: // The file selected is too large        case -110: // The file selected is too large
515          var max_file_mbs = ((parseInt(ref.settings.file_size_limit) / 1024) / 1024);          var max_file_mbs = ref.getMbs(ref.settings.file_size_limit);
516          var file_mbs = ((file.size / 1024) / 1024);          var file_mbs = ((file.size / 1024) / 1024);
517          ref.displayMessage(Drupal.t('The file size (!num1 MB) exceeds the file size limit (!num2 MB)!', {'!num1':file_mbs.toFixed(2), '!num2':max_file_mbs.toFixed(2)}), 'error');          ref.displayMessage(Drupal.t('The file size (!num1 MB) exceeds the file size limit (!num2 MB)!', {'!num1':file_mbs.toFixed(2), '!num2':max_file_mbs.toFixed(2)}), 'error');
518          break;          break;
# Line 522  function SWFU(id, settings) { Line 522  function SWFU(id, settings) {
522    };    };
523    
524    /**    /**
525       * Calculates the MB's from a given string
526       */
527      ref.getMbs = function(size) {
528        // B, KB, MB and GB
529        if (size.indexOf('MB') > -1) {
530          return parseInt(size);
531        }
532        else if (size.indexOf('GB') > -1) {
533          return (parseInt(size) * 1024);
534        }
535        else if (size.indexOf('KB') > -1) {
536          return (parseInt(size) / 1024);
537        }
538        else if (size.indexOf('B') > -1) {
539          return ((parseInt(size) / 1024) / 1024);
540        };
541        return false;
542      };
543    
544      /**
545     * Displays messages     * Displays messages
546     */     */
547    ref.displayMessage = function(message, type) {    ref.displayMessage = function(message, type) {
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2
  ViewVC Help
Powered by ViewVC 1.1.2