Don't open another window when replying to a message displayed in extwin

Thomas Bruederli

2012-11-05 7bf6d2f01e6b5a24669febae3464f074d8c59cb7

Don't open another window when replying to a message displayed in extwin

 program/js/app.js

@@ -3018,10 +3018,13 @@
    var url = this.url('mail/compose', p);

    // open new compose window
    if (this.env.compose_extwin)
    if (this.env.compose_extwin && !this.env.extwin) {
      this.open_window(url, 1150, 900);
    else
    }
    else {
      this.redirect(url);
      window.resizeTo(Math.max(1150, $(window).width()), Math.max(900, $(window).height()));
    }
  };

  // init message compose form: set focus and eventhandlers
@@ -6041,10 +6044,18 @@
    if (lock || lock === null)
      this.set_busy(true);

    if (this.is_framed())
    if (this.is_framed()) {
      parent.rcmail.redirect(url, lock);
    else
    }
    else {
      if (this.env.extwin) {
        if (typeof url == 'string')
          url += (url.indexOf('?') < 0 ? '?' : '&') + '_extwin=1';
        else
          url._extwin = 1;
      }
      this.location_href(url, window);
    }
  };

  this.goto_url = function(action, query, lock)