Fix Closure-compiler warnings, small code improvements

pull/158/merge
Aleksander Machniak 11 years ago
parent 774f9dc835
commit 538e64c572

@ -1,4 +1,4 @@
/* /**
* Archive plugin script * Archive plugin script
* @version 2.1 * @version 2.1
*/ */

@ -1,4 +1,4 @@
/* /**
* Help plugin client script * Help plugin client script
* @version 1.4 * @version 1.4
*/ */

@ -1,4 +1,4 @@
/* /**
* Password plugin script * Password plugin script
* @version @package_version@ * @version @package_version@
*/ */
@ -8,17 +8,17 @@ if (window.rcmail) {
// register command handler // register command handler
rcmail.register_command('plugin.password-save', function() { rcmail.register_command('plugin.password-save', function() {
var input_curpasswd = rcube_find_object('_curpasswd'); var input_curpasswd = rcube_find_object('_curpasswd'),
var input_newpasswd = rcube_find_object('_newpasswd'); input_newpasswd = rcube_find_object('_newpasswd'),
var input_confpasswd = rcube_find_object('_confpasswd'); input_confpasswd = rcube_find_object('_confpasswd');
if (input_curpasswd && input_curpasswd.value=='') { if (input_curpasswd && input_curpasswd.value == '') {
alert(rcmail.gettext('nocurpassword', 'password')); alert(rcmail.gettext('nocurpassword', 'password'));
input_curpasswd.focus(); input_curpasswd.focus();
} else if (input_newpasswd && input_newpasswd.value=='') { } else if (input_newpasswd && input_newpasswd.value == '') {
alert(rcmail.gettext('nopassword', 'password')); alert(rcmail.gettext('nopassword', 'password'));
input_newpasswd.focus(); input_newpasswd.focus();
} else if (input_confpasswd && input_confpasswd.value=='') { } else if (input_confpasswd && input_confpasswd.value == '') {
alert(rcmail.gettext('nopassword', 'password')); alert(rcmail.gettext('nopassword', 'password'));
input_confpasswd.focus(); input_confpasswd.focus();
} else if (input_newpasswd && input_confpasswd && input_newpasswd.value != input_confpasswd.value) { } else if (input_newpasswd && input_confpasswd && input_newpasswd.value != input_confpasswd.value) {

@ -1,4 +1,4 @@
/* /**
* vcard_attachments plugin script * vcard_attachments plugin script
* @version @package_version@ * @version @package_version@
*/ */
@ -13,6 +13,7 @@ function plugin_vcard_save_contact(mime_id)
function plugin_vcard_insertrow(data) function plugin_vcard_insertrow(data)
{ {
var ctype = data.row.ctype; var ctype = data.row.ctype;
if (ctype == 'text/vcard' || ctype == 'text/x-vcard' || ctype == 'text/directory') { if (ctype == 'text/vcard' || ctype == 'text/x-vcard' || ctype == 'text/directory') {
$('#rcmrow'+data.uid+' > td.attachment').html('<img src="'+rcmail.env.vcard_icon+'" alt="" />'); $('#rcmrow'+data.uid+' > td.attachment').html('<img src="'+rcmail.env.vcard_icon+'" alt="" />');
} }

@ -45,6 +45,7 @@ class rcmail_output_html extends rcmail_output
protected $footer = ''; protected $footer = '';
protected $body = ''; protected $body = '';
protected $base_path = ''; protected $base_path = '';
protected $devel_mode = false;
// deprecated names of templates used before 0.5 // deprecated names of templates used before 0.5
protected $deprecated_templates = array( protected $deprecated_templates = array(
@ -64,6 +65,8 @@ class rcmail_output_html extends rcmail_output
{ {
parent::__construct(); parent::__construct();
$this->devel_mode = $this->config->get('devel_mode');
//$this->framed = $framed; //$this->framed = $framed;
$this->set_env('task', $task); $this->set_env('task', $task);
$this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin')); $this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin'));
@ -658,8 +661,19 @@ class rcmail_output_html extends rcmail_output
} }
// add file modification timestamp // add file modification timestamp
if (preg_match('/\.(js|css)$/', $file)) { if (preg_match('/\.(js|css)$/', $file, $m)) {
if ($fs = @filemtime($file)) { $fs = false;
$ext = $m[1];
// use minified file if exists (not in development mode)
if (!$this->devel_mode && !preg_match('/\.min\.' . $ext . '$/', $file)) {
$minified_file = substr($file, 0, strlen($ext) * -1) . 'min.' . $ext;
if ($fs = @filemtime($minified_file)) {
$file = $minified_file . '?s=' . $fs;
}
}
if (!$fs && ($fs = @filemtime($file))) {
$file .= '?s=' . $fs; $file .= '?s=' . $fs;
} }
} }
@ -971,7 +985,7 @@ class rcmail_output_html extends rcmail_output
$content = html::quote($this->get_pagetitle()); $content = html::quote($this->get_pagetitle());
} }
else if ($object == 'pagetitle') { else if ($object == 'pagetitle') {
if ($this->config->get('devel_mode') && !empty($_SESSION['username'])) if ($this->devel_mode && !empty($_SESSION['username']))
$title = $_SESSION['username'].' :: '; $title = $_SESSION['username'].' :: ';
else if ($prod_name = $this->config->get('product_name')) else if ($prod_name = $this->config->get('product_name'))
$title = $prod_name . ' :: '; $title = $prod_name . ' :: ';

@ -20,7 +20,7 @@
/** /**
* Roundcube List Widget class * Roundcube List Widget class
* @contructor * @constructor
*/ */
function rcube_list_widget(list, p) function rcube_list_widget(list, p)
{ {
@ -32,10 +32,6 @@ function rcube_list_widget(list, p)
this.list = list ? list : null; this.list = list ? list : null;
this.tagname = this.list ? this.list.nodeName.toLowerCase() : 'table'; this.tagname = this.list ? this.list.nodeName.toLowerCase() : 'table';
this.id_regexp = /^rcmrow([a-z0-9\-_=\+\/]+)/i; this.id_regexp = /^rcmrow([a-z0-9\-_=\+\/]+)/i;
this.thead;
this.tbody;
this.fixed_header;
this.frame = null;
this.rows = {}; this.rows = {};
this.selection = []; this.selection = [];
this.rowcount = 0; this.rowcount = 0;

Loading…
Cancel
Save