From 6accc270f42453e97cc08b76c49ffddf05aac50f Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Thu, 14 Mar 2013 21:21:16 +0100 Subject: [PATCH] went vmousedown for all items instead of scrollable lists --- src/js/app-router.js | 23 +++++++---------------- src/js/view/folderlist-view.js | 12 +++++++++++- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/js/app-router.js b/src/js/app-router.js index 063280b..090d554 100644 --- a/src/js/app-router.js +++ b/src/js/app-router.js @@ -11,7 +11,6 @@ var AppRouter = Backbone.Router.extend({ }, initialize: function () { - this.firstPage = true; }, login: function() { @@ -28,10 +27,8 @@ var AppRouter = Backbone.Router.extend({ }, compose: function() { - // $.mobile.defaultPageTransition = 'slideup'; var composeView = new app.view.ComposeView(); this.changePage(composeView); - // $.mobile.defaultPageTransition = 'slideup'; }, folders: function(userId) { @@ -64,25 +61,19 @@ var AppRouter = Backbone.Router.extend({ $('body').append(pageEl); // handle back click - var self = this; pageEl.on('vmousedown', '#backBtn', function(e) { e.preventDefault(); - self.back = true; window.history.back(); }); - // change to the page using jQM transitions - var transition = $.mobile.defaultPageTransition; - // We don't want to slide the first page - if (this.firstPage) { - transition = 'none'; - this.firstPage = false; - } - $.mobile.changePage(pageEl, {changeHash:false, transition:transition, reverse:this.back}); + // change page for link buttons on vmousedown instead of waiting on vmouseup + pageEl.on('vmousedown', 'a[data-role="button"]', function(e) { + e.preventDefault(); + var href = $(e.currentTarget).attr('href'); + window.location = href; + }); - // change transition direction back after back button was pushed - this.back = false; - // $.mobile.defaultPageTransition = 'fade'; + $.mobile.changePage(pageEl, {changeHash:false, reverse:false}); } }); \ No newline at end of file diff --git a/src/js/view/folderlist-view.js b/src/js/view/folderlist-view.js index fa05e9b..a82e2ed 100644 --- a/src/js/view/folderlist-view.js +++ b/src/js/view/folderlist-view.js @@ -7,7 +7,17 @@ app.view.FolderListView = Backbone.View.extend({ }, render:function (eventName) { - $(this.el).html(this.template(this.options)); + var page = $(this.el); + + page.html(this.template(this.options)); + + // change page for folder links on vmousedown instead of waiting on vmouseup + page.on('vmousedown', 'li a', function(e) { + e.preventDefault(); + var href = $(e.currentTarget).attr('href'); + window.location = href; + }); + return this; } }); \ No newline at end of file