- Don't load jqueryui plugin, it's required now by default - Move datepicke...

alecpl

2012-01-01 89c30a00a71988c8db632f8f3cc94ed241bdaa1f

 program/js/app.js

@@ -907,7 +907,7 @@
        if (!this.gui_objects.messageform)
          break;

        if (!this.check_compose_input())
        if (!props.nocheck && !this.check_compose_input(command))
          break;

        // Reset the auto-save timer
@@ -931,8 +931,8 @@
      case 'send-attachment':
        // Reset the auto-save timer
        self.clearTimeout(this.save_timer);

        this.upload_file(props)
        
        this.upload_file(props || this.gui_objects.uploadform);
        break;

      case 'insert-sig':
@@ -1043,7 +1043,7 @@
        break;

      case 'upload-photo':
        this.upload_contact_photo(props);
        this.upload_contact_photo(props || this.gui_objects.uploadform);
        break;

      case 'delete-photo':
@@ -1364,7 +1364,7 @@
              if (this.folder_auto_timer)
                window.clearTimeout(this.folder_auto_timer);

              this.folder_auto_expand = k;
              this.folder_auto_expand = this.env.mailboxes[k].id;
              this.folder_auto_timer = window.setTimeout(function() {
                rcmail.command('collapse-folder', rcmail.folder_auto_expand);
                rcmail.drag_start(null);
@@ -2960,7 +2960,7 @@
  };

  // checks the input fields before sending a message
  this.check_compose_input = function()
  this.check_compose_input = function(cmd)
  {
    // check input fields
    var ed, input_to = $("[name='_to']"),
@@ -2995,15 +2995,28 @@

    // display localized warning for missing subject
    if (input_subject.val() == '') {
      var subject = prompt(this.get_label('nosubjectwarning'), this.get_label('nosubject'));
      var myprompt = $('<div class="prompt">').html('<div class="message">' + this.get_label('nosubjectwarning') + '</div>').appendTo(document.body);
      var prompt_value = $('<input>').attr('type', 'text').attr('size', 30).appendTo(myprompt).val(this.get_label('nosubject'));

      // user hit cancel, so don't send
      if (!subject && subject !== '') {
      var buttons = {};
      buttons[this.get_label('cancel')] = function(){
        input_subject.focus();
        return false;
      }
      else
        input_subject.val((subject ? subject : this.get_label('nosubject')));
        $(this).dialog('close');
      };
      buttons[this.get_label('sendmessage')] = function(){
        input_subject.val(prompt_value.val());
        $(this).dialog('close');
        ref.command(cmd, { nocheck:true });  // repeat command which triggered this
      };

      myprompt.dialog({
        modal: true,
        resizable: false,
        buttons: buttons,
        close: function(event, ui) { $(this).remove() }
      });
      prompt_value.select();
      return false;
    }

    // Apply spellcheck changes if spell checker is active
@@ -3035,6 +3048,11 @@
      this.display_spellcheck_controls(false);
      this.plain2html($('#'+props.id).val(), props.id);
      tinyMCE.execCommand('mceAddControl', false, props.id);

      if (this.env.default_font)
        window.setTimeout(function() {
          $(tinyMCE.get(props.id).getBody()).css('font-family', rcmail.env.default_font);
        }, 500);
    }
    else {
      var thisMCE = tinyMCE.get(props.id), existingHtml;
@@ -3074,7 +3092,7 @@
      if (!vis)
        this.stop_spellchecking();

      $(this.env.spellcheck.spell_container).css('visibility', vis ? 'visible' : 'hidden');
      $(this.env.spellcheck.spell_container)[vis ? 'show' : 'hide']();
    }
  };

@@ -3339,10 +3357,10 @@
        ts = frame_name.replace(/^rcmupload/, '');

      if (this.env.loadingicon)
        content = '<img src="'+this.env.loadingicon+'" alt="" />'+content;
        content = '<img src="'+this.env.loadingicon+'" alt="" class="uploading" />'+content;
      if (this.env.cancelicon)
        content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload"><img src="'+this.env.cancelicon+'" alt="" /></a>'+content;
      this.add2attachment_list(ts, { name:'', html:content, complete:false });
        content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload" class="cancelupload"><img src="'+this.env.cancelicon+'" alt="" /></a>'+content;
      this.add2attachment_list(ts, { name:'', html:content, classname:'uploading', complete:false });

      // upload progress support
      if (this.env.upload_progress_time) {
@@ -3362,7 +3380,7 @@
    if (!this.gui_objects.attachmentlist)
      return false;

    var indicator, li = $('<li>').attr('id', name).html(att.html);
    var indicator, li = $('<li>').attr('id', name).addClass(att.classname).html(att.html);

    // replace indicator's li
    if (upload_id && (indicator = document.getElementById(upload_id))) {
@@ -4057,7 +4075,7 @@
  this.delete_contacts = function()
  {
    var selection = this.contact_list.get_selection(),
      undelete = this.env.address_sources[this.env.source].undelete;
      undelete = this.env.source && this.env.address_sources[this.env.source].undelete;

    // exit if no mailbox specified or if selection is empty
    if (!(selection.length || this.env.cid) || (!undelete && !confirm(this.get_label('deletecontactconfirm'))))
@@ -4182,7 +4200,6 @@
        yearRange: '-100:+10',
        showOtherMonths: true,
        selectOtherMonths: true,
        monthNamesShort: this.env.month_names,
        onSelect: function(dateText) { $(this).focus().val(dateText) }
      });
      $('input.datepicker').datepicker();
@@ -5564,8 +5581,9 @@
      if (typeof content === 'object' && content.type == 'image')
        this.percent_indicator(this.gui_objects.quotadisplay, content);
      else
        $(this.gui_objects.quotadisplay).html(content);
        $(this.gui_objects.quotadisplay).html(content.percent+'%').attr('title', content.title);
    }
    this.triggerEvent('setquota', content);
  };

  // update the mailboxlist
@@ -5606,7 +5624,7 @@
      }

      if (mycount && text_obj.length)
        text_obj.html(' ('+mycount+')');
        text_obj.html(this.env.unreadwrap.replace(/%[sd]/, mycount));
      else if (text_obj.length)
        text_obj.remove();

@@ -5637,16 +5655,6 @@

      this.set_pagetitle(new_title);
    }
  };

  this.toggle_prefer_html = function(checkbox)
  {
    $('#rcmfd_show_images').prop('disabled', !checkbox.checked).val(0);
  };

  this.toggle_preview_pane = function(checkbox)
  {
    $('#rcmfd_preview_pane_mark_read').prop('disabled', !checkbox.checked);
  };

  // display fetched raw headers