From a479d5850e9b4b370d93c492d39f0ab0c02980a9 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Fri, 27 Jun 2014 12:36:43 +0200 Subject: [PATCH] Use custom wo-touch directive rather than ng-click --- src/js/controller/mail-list.js | 23 +++++++++++++++++++++++ src/tpl/about.html | 2 +- src/tpl/account.html | 6 +++--- src/tpl/add-account.html | 2 +- src/tpl/contacts.html | 4 ++-- src/tpl/dialog.html | 6 +++--- src/tpl/login-existing.html | 2 +- src/tpl/login-initial.html | 4 ++-- src/tpl/login-new-device.html | 2 +- src/tpl/login-privatekey-download.html | 2 +- src/tpl/mail-list.html | 8 +++++--- src/tpl/navigation.html | 10 +++++----- src/tpl/privatekey-upload.html | 6 +++--- src/tpl/read.html | 22 +++++++++++----------- src/tpl/set-passphrase.html | 4 ++-- src/tpl/write.html | 10 +++++----- 16 files changed, 69 insertions(+), 44 deletions(-) diff --git a/src/js/controller/mail-list.js b/src/js/controller/mail-list.js index 8afdb87..0e677b9 100644 --- a/src/js/controller/mail-list.js +++ b/src/js/controller/mail-list.js @@ -275,6 +275,29 @@ define(function(require) { var ngModule = angular.module('mail-list', []); + ngModule.directive('woTouch', function($parse) { + return function(scope, elm, attrs) { + var handler = $parse(attrs.woTouch); + + elm.on('touchstart', function() { + elm.addClass('active'); + }); + elm.on('touchleave touchcancel touchmove', function() { + elm.removeClass('active'); + }); + + elm.on('touchend click', function(event) { + event.preventDefault(); + elm.removeClass('active'); + scope.$apply(function() { + handler(scope, { + $event: event + }); + }); + }); + }; + }); + ngModule.directive('listScroll', function() { return { link: function(scope, elm, attrs) { diff --git a/src/tpl/about.html b/src/tpl/about.html index caf7399..0b459cd 100644 --- a/src/tpl/about.html +++ b/src/tpl/about.html @@ -1,6 +1,6 @@
- +
diff --git a/src/tpl/account.html b/src/tpl/account.html index b535022..ca2d7ae 100644 --- a/src/tpl/account.html +++ b/src/tpl/account.html @@ -1,7 +1,7 @@

Account

- +
@@ -29,8 +29,8 @@
- - + +
diff --git a/src/tpl/add-account.html b/src/tpl/add-account.html index 534a131..572a897 100644 --- a/src/tpl/add-account.html +++ b/src/tpl/add-account.html @@ -3,7 +3,7 @@

Select email account

    -
  • +
  • Google Mail
  • diff --git a/src/tpl/contacts.html b/src/tpl/contacts.html index 4d0eb5c..bc46620 100644 --- a/src/tpl/contacts.html +++ b/src/tpl/contacts.html @@ -1,7 +1,7 @@

    Contacts

    - +
    @@ -31,7 +31,7 @@ {{key.userId}} {{key.created | date:'mediumDate'}} {{key.bitSize}} bit - +
    diff --git a/src/tpl/dialog.html b/src/tpl/dialog.html index ae98177..c381f86 100644 --- a/src/tpl/dialog.html +++ b/src/tpl/dialog.html @@ -1,14 +1,14 @@

    {{state.dialog.title}}

    - +

    {{state.dialog.message}}

    - - + +
    \ No newline at end of file diff --git a/src/tpl/login-existing.html b/src/tpl/login-existing.html index 9860d0e..3b4f1cf 100644 --- a/src/tpl/login-existing.html +++ b/src/tpl/login-existing.html @@ -13,7 +13,7 @@
    Forgot your passphrase?
    - +
diff --git a/src/tpl/login-initial.html b/src/tpl/login-initial.html index b21ec53..1e20114 100644 --- a/src/tpl/login-initial.html +++ b/src/tpl/login-initial.html @@ -6,7 +6,7 @@
-

Generate PGP key. You can set a passphrase to protect your key on disk. This must be entered everytime you start the app. For no passphrase just press continue.

Alternatively you can also import an existing PGP key.

+

Generate PGP key. You can set a passphrase to protect your key on disk. This must be entered everytime you start the app. For no passphrase just press continue.

Alternatively you can also import an existing PGP key.


@@ -21,7 +21,7 @@
- +
diff --git a/src/tpl/login-new-device.html b/src/tpl/login-new-device.html index 04ea3c4..8c2717f 100644 --- a/src/tpl/login-new-device.html +++ b/src/tpl/login-new-device.html @@ -16,7 +16,7 @@
Lost your keyfile or passphrase? -
+
diff --git a/src/tpl/login-privatekey-download.html b/src/tpl/login-privatekey-download.html index c543347..e481f1a 100644 --- a/src/tpl/login-privatekey-download.html +++ b/src/tpl/login-privatekey-download.html @@ -23,7 +23,7 @@
- +
diff --git a/src/tpl/mail-list.html b/src/tpl/mail-list.html index 6c1be69..c5bb1b2 100644 --- a/src/tpl/mail-list.html +++ b/src/tpl/mail-list.html @@ -1,8 +1,8 @@
-
+

{{state.nav.currentFolder.type}}

- +
@@ -11,7 +11,9 @@
    -
  • +

  • {{email.from[0].name || email.from[0].address}}

    diff --git a/src/tpl/navigation.html b/src/tpl/navigation.html index 637474c..d83d54a 100644 --- a/src/tpl/navigation.html +++ b/src/tpl/navigation.html @@ -5,7 +5,7 @@