Roundcubemail devel
blame | history | patch | commit | commitdiff | ignore whitespace
Aleksander Machniak
2013-12-08 fd0c123e44391aa01a85c5aeebbd0cea418f0808 
 program/js/app.js


@@ -34,7 +34,7 @@




  // webmail client settings


  this.dblclick_time = 500;


  this.message_time = 4000;


  this.message_time = 5000;


  this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');




  // environment defaults


@@ -186,8 +186,6 @@




    if (this.env.permaurl)


      this.enable_command('permaurl', 'extwin', true);




    this.local_storage_prefix = 'roundcube.' + (this.env.user_id || 'anonymous') + '.';




    switch (this.task) {




@@ -1728,6 +1726,9 @@


      extwin.document.write('<html><body>' + this.get_label('loading') + '</body></html>');


    }




    // allow plugins to grab the window reference (#1489413)


    this.triggerEvent('openwindow', { url:url, handle:extwin });




    // focus window, delayed to bring to front


    window.setTimeout(function() { extwin && extwin.focus(); }, 10);




@@ -3199,7 +3200,7 @@


  {


    this.env.recipients_delimiter = this.env.recipients_separator + ' ';




    obj[bw.ie || bw.safari || bw.chrome ? 'keydown' : 'keypress'](function(e) { return ref.ksearch_keydown(e, this, props); })


    obj.keydown(function(e) { return ref.ksearch_keydown(e, this, props); })


      .attr('autocomplete', 'off');


  };




@@ -5544,9 +5545,8 @@


      target = win;


    }




    if (action && (id || action == 'add-identity')) {


      this.set_busy(true);


      this.location_href(url, target);


    if (id || action == 'add-identity') {


      this.location_href(url, target, true);


    }




    return true;


@@ -6209,7 +6209,7 @@


    this.triggerEvent('message', { message:msg, type:type, timeout:timeout, object:obj });




    if (timeout > 0)


      setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);


      setTimeout(function() { ref.hide_message(id, type != 'loading'); }, timeout);


    return id;


  };




@@ -6843,7 +6843,6 @@




          if ((response.action == 'list' || response.action == 'search') && this.message_list) {


            this.msglist_select(this.message_list);


            this.message_list.resize();


            this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });


          }


        }


@@ -6854,7 +6853,6 @@


            this.enable_command('search-create', this.env.source == '');


            this.enable_command('search-delete', this.env.search_id);


            this.update_group_commands();


            this.contact_list.resize();


            this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });


          }


        }


@@ -7445,11 +7443,20 @@


    setCookie(name, value, expires, this.env.cookie_path, this.env.cookie_domain, this.env.cookie_secure);


  };




  this.get_local_storage_prefix = function()


  {


    if (!this.local_storage_prefix)


      this.local_storage_prefix = 'roundcube.' + (this.env.user_id || 'anonymous') + '.';




    return this.local_storage_prefix;


  };




  // wrapper for localStorage.getItem(key)


  this.local_storage_get_item = function(key, deflt, encrypted)


  {




    // TODO: add encryption


    var item = localStorage.getItem(this.local_storage_prefix + key);


    var item = localStorage.getItem(this.get_local_storage_prefix() + key);


    return item !== null ? JSON.parse(item) : (deflt || null);


  };




@@ -7457,13 +7464,13 @@


  this.local_storage_set_item = function(key, data, encrypted)


  {


    // TODO: add encryption


    return localStorage.setItem(this.local_storage_prefix + key, JSON.stringify(data));


    return localStorage.setItem(this.get_local_storage_prefix() + key, JSON.stringify(data));


  };




  // wrapper for localStorage.removeItem(key)


  this.local_storage_remove_item = function(key)


  {


    return localStorage.removeItem(this.local_storage_prefix + key);


    return localStorage.removeItem(this.get_local_storage_prefix() + key);


  };




}  // end object rcube_webmail