summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-03 11:29:22 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-03 11:29:22 +0200
commit9763581d81af8e3112edc3617a7dc254cdadc3cf (patch)
tree26f6d261070fa38feab549c54ac04ea368f717a0
parent0ed7034d353cf0f2a3348a74c8562fdbbd1cff67 (diff)
parent1257dd6796b0655545bb7e4e4dd6d776bebd8544 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
-rw-r--r--program/js/common.js4
-rw-r--r--program/js/list.js10
-rw-r--r--skins/classic/iehacks.css10
-rw-r--r--skins/classic/mail.css3
4 files changed, 20 insertions, 7 deletions
diff --git a/program/js/common.js b/program/js/common.js
index 70e435ef1..fdef3453e 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -83,6 +83,7 @@ function roundcube_browser()
if (this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/.test(this.agent_lc)))
this.lang = RegExp.$1;
+ this.mobile = this.agent_lc.match(/iphone|ipad|ipod|android|blackberry|iemobile|opera mini|opera mobi/);
this.dhtml = ((this.ie4 && this.win) || this.ie5 || this.ie6 || this.ns4 || this.mz);
this.vml = (this.win && this.ie && this.dom && !this.opera);
this.pngalpha = (this.mz || (this.opera && this.vendver >= 6) || (this.ie && this.mac && this.vendver >= 5) ||
@@ -124,6 +125,9 @@ function roundcube_browser()
else if (this.safari || this.chrome)
classname += ' webkit';
+ if (this.mobile)
+ classname += ' mobile';
+
if (document.documentElement)
document.documentElement.className += classname;
};
diff --git a/program/js/list.js b/program/js/list.js
index e3be9a050..b194721f4 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -112,7 +112,7 @@ init_row: function(row)
row.onmousedown = function(e){ return self.drag_row(e, this.uid); };
row.onmouseup = function(e){ return self.click_row(e, this.uid); };
- if (bw.iphone || bw.ipad) {
+ if (bw.mobile) {
row.addEventListener('touchstart', function(e) {
if (e.touches.length == 1) {
if (!self.drag_row(rcube_event.touchevent(e.touches[0]), this.uid))
@@ -313,7 +313,7 @@ drag_row: function(e, id)
this.drag_mouse_start = rcube_event.get_mouse_pos(e);
rcube_event.add_listener({event:'mousemove', object:this, method:'drag_mouse_move'});
rcube_event.add_listener({event:'mouseup', object:this, method:'drag_mouse_up'});
- if (bw.iphone || bw.ipad) {
+ if (bw.mobile) {
rcube_event.add_listener({event:'touchmove', object:this, method:'drag_mouse_move'});
rcube_event.add_listener({event:'touchend', object:this, method:'drag_mouse_up'});
}
@@ -1220,7 +1220,7 @@ drag_mouse_move: function(e)
drag_mouse_up: function(e)
{
document.onmousemove = null;
-
+
if (e.type == 'touchend') {
if (e.changedTouches.length != 1)
return rcube_event.cancel(e);
@@ -1239,8 +1239,8 @@ drag_mouse_up: function(e)
rcube_event.remove_listener({event:'mousemove', object:this, method:'drag_mouse_move'});
rcube_event.remove_listener({event:'mouseup', object:this, method:'drag_mouse_up'});
-
- if (bw.iphone || bw.ipad) {
+
+ if (bw.mobile) {
rcube_event.remove_listener({event:'touchmove', object:this, method:'drag_mouse_move'});
rcube_event.remove_listener({event:'touchend', object:this, method:'drag_mouse_up'});
}
diff --git a/skins/classic/iehacks.css b/skins/classic/iehacks.css
index d09be3d80..2bd3ce865 100644
--- a/skins/classic/iehacks.css
+++ b/skins/classic/iehacks.css
@@ -150,6 +150,16 @@ body.iframe div.messageheaderbox
height: expression((parseInt(this.parentNode.offsetHeight)-1-parseInt(document.getElementById('compose-headers').offsetHeight))+'px');
}
+#compose-attachments ul li
+{
+ width: 1000px; /* for IE7 */
+}
+
+#compose-attachments li a
+{
+ float: left; /* for IE7 */
+}
+
#messagelist
{
width: inherit;
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index cf7b69a38..c38d7448c 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -1485,8 +1485,7 @@ input.from_address
text-indent: -5000px;
width: 17px;
height: 16px;
- display: block;
- float: left;
+ display: inline-block;
text-decoration: none;
}