- Fixed issues related to creating contacts in source which isn't currently selected (#1487990)

git-svn-id: https://svn.roundcube.net/trunk@4913 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 13 insertions, 2 deletions

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index d26b0d5b4..6a35c596a 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -637,7 +637,7 @@ function rcube_webmail()
           }
           // contacts/identities
           else {
-            //
+            // reload form
             if (props == 'reload') {
               form.action += '?_reload=1';
             }
@@ -647,7 +647,7 @@ function rcube_webmail()
               break;
             }
             else if (this.task == 'settings' && (this.env.identities_level % 2) == 0  &&
-              (input = $("input[name='_email']", form)) && input.length&& !rcube_check_email(input.val())
+              (input = $("input[name='_email']", form)) && input.length && !rcube_check_email(input.val())
             ) {
               alert(this.get_label('noemailwarning'));
               input.focus();
@@ -658,6 +658,10 @@ function rcube_webmail()
             $('input.placeholder').each(function(){ if (this.value == this._placeholder) this.value = ''; });
           }
 
+          // add selected source (on the list)
+          if (parent.rcmail && parent.rcmail.env.source)
+            form.action = this.add_url(form.action, '_orig_source', parent.rcmail.env.source);
+
           form.submit();
         }
         break;
@@ -3803,6 +3807,13 @@ function rcube_webmail()
       add_url = '&_framed=1';
       target = window.frames[this.env.contentframe];
       this.show_contentframe(true);
+
+      // load dummy content
+      if (!cid) {
+        // unselect selected row(s)
+        this.contact_list.clear_selection();
+        this.enable_command('delete', 'compose', false);
+      }
     }
     else if (framed)
       return false;