summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js33
-rwxr-xr-xprogram/js/tiny_mce/themes/advanced/langs/sv_dlg.js4
2 files changed, 27 insertions, 10 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 346f4e44e..38141a92f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1006,15 +1006,9 @@ function rcube_webmail()
// user settings commands
case 'preferences':
- this.goto_url('');
- break;
-
case 'identities':
- this.goto_url('settings/identities');
- break;
-
case 'folders':
- this.goto_url('settings/folders');
+ this.goto_url('settings/' + command);
break;
// unified command call (command name == function name)
@@ -1701,7 +1695,7 @@ function rcube_webmail()
var action = flags.mbox == this.env.drafts_mailbox ? 'compose' : 'show';
var uid_param = flags.mbox == this.env.drafts_mailbox ? '_draft_uid' : '_uid';
cols.subject = '<a href="./?_task=mail&_action='+action+'&_mbox='+urlencode(flags.mbox)+'&'+uid_param+'='+uid+'"'+
- ' onclick="return rcube_event.cancel(event)">'+cols.subject+'</a>';
+ ' onclick="return rcube_event.cancel(event)" onmouseover="rcube_webmail.long_subject_title(this,'+(message.depth+1)+')">'+cols.subject+'</a>';
}
// add each submitted col
@@ -3777,6 +3771,9 @@ function rcube_webmail()
this.show_contentframe(false);
}
+ if (this.env.group)
+ qs += '&_gid='+urlencode(this.env.group);
+
// also send search request to get the right records from the next page
if (this.env.search_request)
qs += '&_search='+this.env.search_request;
@@ -4309,6 +4306,14 @@ function rcube_webmail()
}
};
+ // disables subscription checkbox (for protected folder)
+ this.disable_subscription = function(folder)
+ {
+ var id = this.get_folder_row_id(folder);
+ if (id)
+ $('input[name="_subscribed[]"]', $('#'+id)).attr('disabled', true);
+ };
+
this.folder_size = function(folder)
{
var lock = this.set_busy(true, 'loading');
@@ -4666,6 +4671,7 @@ function rcube_webmail()
}
th.appendChild(tr);
thead.parentNode.replaceChild(th, thead);
+ thead = th;
}
for (n=0, len=this.env.coltypes.length; n<len; n++) {
@@ -5288,6 +5294,17 @@ function rcube_webmail()
} // end object rcube_webmail
+
+// some static methods
+rcube_webmail.long_subject_title = function(elem, indent)
+{
+ if (!elem.title) {
+ var $elem = $(elem);
+ if ($elem.width() + indent * 15 > $elem.parent().width())
+ elem.title = $elem.html();
+ }
+};
+
// copy event engine prototype
rcube_webmail.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;
rcube_webmail.prototype.removeEventListener = rcube_event_engine.prototype.removeEventListener;
diff --git a/program/js/tiny_mce/themes/advanced/langs/sv_dlg.js b/program/js/tiny_mce/themes/advanced/langs/sv_dlg.js
index 12a5941a0..a9b93de4f 100755
--- a/program/js/tiny_mce/themes/advanced/langs/sv_dlg.js
+++ b/program/js/tiny_mce/themes/advanced/langs/sv_dlg.js
@@ -42,8 +42,8 @@ image_align_right:"H\u00F6ger",
link_title:"Infoga/redigera l\u00E4nk",
link_url:"L\u00E4nkens URL",
link_target:"M\u00E5l",
-link_target_same:"\u00D6\u0096ppna l\u00E4nken i samma f\u00F6nster",
-link_target_blank:"\u00D6\u0096ppna l\u00E4nken i ett nytt f\u00F6nster",
+link_target_same:"\u00D6ppna l\u00E4nken i samma f\u00F6nster",
+link_target_blank:"\u00D6ppna l\u00E4nken i ett nytt f\u00F6nster",
link_titlefield:"Titel",
link_is_email:"L\u00E4nken du angav verkar vara en e-post adress. Vill du infoga mailto: prefixet p\u00E5 l\u00E4nken?",
link_is_external:"L\u00E4nken du angav verkar vara en extern adress. Vill du infoga http:// prefixet p\u00E5 l\u00E4nken?",