comparison messages/static/js/tabbed_messages.js @ 716:f68694669023

Merge with maintenance work.
author Brian Neal <bgneal@gmail.com>
date Tue, 17 Sep 2013 21:13:31 -0500
parents c09ed90c891b
children 796103a2215b
comparison
equal deleted inserted replaced
710:13a1713d05b5 716:f68694669023
16 activate: function(event, ui) { 16 activate: function(event, ui) {
17 $(ui.panel).html(''); 17 $(ui.panel).html('');
18 }, 18 },
19 load: function(event, ui) { 19 load: function(event, ui) {
20 selectedTab = ui; 20 selectedTab = ui;
21 if (doReply && ui.tab.index() == 1) 21
22 if (ui.tab.index() == 1 && receiver && !doReply)
23 {
24 $('#id_receiver').val(receiver);
25 receiver = '';
26 }
27 else if (doReply && ui.tab.index() == 1)
22 { 28 {
23 doReply = false; 29 doReply = false;
24 var msg = msgCache[$msgDialog.msgId]; 30 var msg = msgCache[$msgDialog.msgId];
25 $('#id_receiver').val(msg.sender); 31 $('#id_receiver').val(msg.sender);
26 $('#id_subject').val(msg.re_subject); 32 $('#id_subject').val(msg.re_subject);