mirror of https://github.com/moparisthebest/mail
added dropdowns for mobile toolbar
Conflicts: src/js/directives/common.js
This commit is contained in:
Mario Volke
Tankred Hase
parent
06498017df
commit
2594ff515b
|
|
@ -1,8 +1,11 @@
|
|||
'use strict';
|
||||
define(function(require) {
|
||||
'use strict';
|
||||
|
||||
var ngModule = angular.module('woDirectives', []);
|
||||
var angular = require('angular');
|
||||
|
||||
ngModule.directive('woTouch', function($parse) {
|
||||
var ngModule = angular.module('woDirectives', []);
|
||||
|
||||
ngModule.directive('woTouch', function($parse) {
|
||||
var className = 'wo-touch-active';
|
||||
|
||||
return function(scope, elm, attrs) {
|
||||
|
|
@ -24,9 +27,9 @@ ngModule.directive('woTouch', function($parse) {
|
|||
});
|
||||
});
|
||||
};
|
||||
});
|
||||
});
|
||||
|
||||
ngModule.directive('woTooltip', function($document, $timeout) {
|
||||
ngModule.directive('woTooltip', function($document, $timeout) {
|
||||
return function(scope, elm, attrs) {
|
||||
var selector = attrs.woTooltip;
|
||||
var tooltip = $document.find(selector);
|
||||
|
|
@ -54,12 +57,12 @@ ngModule.directive('woTooltip', function($document, $timeout) {
|
|||
tooltip[0].style.left = '-9999px';
|
||||
});
|
||||
};
|
||||
});
|
||||
});
|
||||
|
||||
ngModule.directive('woDropdown', function($document, $timeout) {
|
||||
ngModule.directive('woDropdown', function($document, $timeout) {
|
||||
return function(scope, elm, attrs) {
|
||||
var selector = attrs.woDropdown;
|
||||
var position = attrs.woDropdownPosition;
|
||||
var position = (attrs.woDropdownPosition || '').split(' ');
|
||||
var dropdown = $document.find(selector);
|
||||
|
||||
function appear() {
|
||||
|
|
@ -68,9 +71,17 @@ ngModule.directive('woDropdown', function($document, $timeout) {
|
|||
var offsetDropdownParent = dropdown.offsetParent().offset();
|
||||
|
||||
// Set dropdown position
|
||||
switch(position[1]) {
|
||||
case 'up':
|
||||
dropdown[0].style.top = (offsetElm.top - offsetDropdownParent.top -
|
||||
dropdown[0].offsetHeight - 3) + 'px';
|
||||
break;
|
||||
default:
|
||||
dropdown[0].style.top = (offsetElm.top - offsetDropdownParent.top +
|
||||
elm[0].offsetHeight) + 'px';
|
||||
switch (position) {
|
||||
elm[0].offsetHeight + 3) + 'px';
|
||||
}
|
||||
|
||||
switch(position[0]) {
|
||||
case 'center':
|
||||
dropdown[0].style.left = (offsetElm.left - offsetDropdownParent.left +
|
||||
elm[0].offsetWidth / 2 - dropdown[0].offsetWidth / 2) + 'px';
|
||||
|
|
@ -101,9 +112,10 @@ ngModule.directive('woDropdown', function($document, $timeout) {
|
|||
}
|
||||
|
||||
function toggle() {
|
||||
if (dropdown.hasClass('dropdown--show')) {
|
||||
if(dropdown.hasClass('dropdown--show')) {
|
||||
disappear();
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
appear();
|
||||
}
|
||||
}
|
||||
|
|
@ -113,7 +125,8 @@ ngModule.directive('woDropdown', function($document, $timeout) {
|
|||
// close if user clicks outside of dropdown and elm
|
||||
$document.on('touchstart.woDropdown click.woDropdown', function(e) {
|
||||
var t = angular.element(e.target);
|
||||
if (!t.closest(dropdown).length &&
|
||||
if(dropdown.hasClass('dropdown--show') &&
|
||||
!t.closest(dropdown).length &&
|
||||
!t.closest(elm).length) {
|
||||
disappear();
|
||||
}
|
||||
|
|
@ -124,6 +137,7 @@ ngModule.directive('woDropdown', function($document, $timeout) {
|
|||
$document.off('touchstart.woDropdown click.woDropdown');
|
||||
});
|
||||
};
|
||||
});
|
||||
});
|
||||
|
||||
module.exports = ngModule;
|
||||
return ngModule;
|
||||
});
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
// Utilities classes
|
||||
|
||||
@import "mixins/responsive";
|
||||
@import "utilities/responsive";
|
||||
|
||||
// Components (TODO: refactor to BEM)
|
||||
@import "components/lightbox";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
background: $color-bg;
|
||||
color: $color-main;
|
||||
border: 1px solid $color-main;
|
||||
margin: 2px 0 0;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
list-style: none;
|
||||
will-change: opacity, transform;
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@
|
|||
|
||||
& > li {
|
||||
flex-grow: 1;
|
||||
.btn-icon-light {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
@include respond-to(md) {
|
||||
|
|
|
|||
|
|
@ -2,35 +2,35 @@
|
|||
|
||||
.u-visible-sm {
|
||||
@include respond-to(md) {
|
||||
display: none;
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
.u-visible-md {
|
||||
@include respond-to(sm-only) {
|
||||
display: none;
|
||||
display: none !important;
|
||||
}
|
||||
@include respond-to(lg) {
|
||||
display: none;
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
.u-visible-lg {
|
||||
@include respond-to(not-lg) {
|
||||
display: none;
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
.u-hidden-sm {
|
||||
@include respond-to(sm-only) {
|
||||
display: none;
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
.u-hidden-md {
|
||||
@include respond-to(md-only) {
|
||||
display: none;
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
.u-hidden-lg {
|
||||
@include respond-to(lg) {
|
||||
display: none;
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
|
|
@ -23,7 +23,10 @@
|
|||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<button class="btn-icon-light" title="Move mail">
|
||||
<button class="btn-icon-light u-visible-sm" title="Move mail" wo-dropdown="#read-dropdown-folder" wo-dropdown-position="center up">
|
||||
<svg><use xlink:href="#icon-folder" /><title>Move mail</title></svg>
|
||||
</button>
|
||||
<button class="btn-icon-light u-hidden-sm" title="Move mail" wo-dropdown="#read-dropdown-folder" wo-dropdown-position="center">
|
||||
<svg><use xlink:href="#icon-folder" /><title>Move mail</title></svg>
|
||||
</button>
|
||||
</li>
|
||||
|
|
@ -33,7 +36,10 @@
|
|||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<button class="btn-icon-light" title="Reply to" wo-dropdown="#reply-selection" wo-dropdown-position="center">
|
||||
<button class="btn-icon-light u-visible-sm" title="Reply to" wo-dropdown="#read-reply-selection" wo-dropdown-position="center up">
|
||||
<svg><use xlink:href="#icon-reply_light" /><title>Reply to</title></svg>
|
||||
</button>
|
||||
<button class="btn-icon-light u-hidden-sm" title="Reply to" wo-dropdown="#read-reply-selection" wo-dropdown-position="center">
|
||||
<svg><use xlink:href="#icon-reply_light" /><title>Reply to</title></svg>
|
||||
</button>
|
||||
</li>
|
||||
|
|
@ -142,10 +148,14 @@
|
|||
</div>
|
||||
|
||||
<!-- dropdowns -->
|
||||
<ul id="reply-selection" class="dropdown">
|
||||
<ul id="read-reply-selection" class="dropdown">
|
||||
<li><button wo-touch="state.writer.write(state.mailList.selected)"><svg><use xlink:href="#icon-reply_light" /></svg> Reply</button></li>
|
||||
<li><button wo-touch="state.writer.write(state.mailList.selected, true)"><svg><use xlink:href="#icon-reply_all_light" /></svg> Reply All</button></li>
|
||||
<li><button wo-touch="state.writer.write(state.mailList.selected, null, true)"><svg><use xlink:href="#icon-forward_light" /></svg> Forward</button></li>
|
||||
</ul>
|
||||
<ul id="read-dropdown-folder" class="dropdown">
|
||||
<li><button><svg><use xlink:href="#icon-folder" /></svg> Lorem</button></li>
|
||||
<li><button><svg><use xlink:href="#icon-folder" /></svg> Ipsum</button></li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue