diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-04 14:17:26 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-04 14:17:26 -0500 |
| commit | 9acdfee187cff9131e1add9e74a0eecb002ed1b5 (patch) | |
| tree | 2ade41f335800ff9103a4b4992207e5b8825003f | |
| parent | 91d17e48aeaebc1b8e1cf714eadb0c0522b1cbcf (diff) | |
dont bind hover events on mobile
| -rw-r--r-- | public/assets/javascripts/mx/extensions/mx.movements.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/lib/View.js | 5 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/site/ProjectList.js | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js index 1ba33c9..2c231ae 100644 --- a/public/assets/javascripts/mx/extensions/mx.movements.js +++ b/public/assets/javascripts/mx/extensions/mx.movements.js @@ -62,7 +62,7 @@ MX.Movements = function (cam) { }, keydown: function (e) { - console.log(e.keyCode) + // console.log(e.keyCode) if (locked || e.altKey || e.metaKey || e.ctrlKey) { return } diff --git a/public/assets/javascripts/ui/lib/View.js b/public/assets/javascripts/ui/lib/View.js index d94e6db..3c65131 100644 --- a/public/assets/javascripts/ui/lib/View.js +++ b/public/assets/javascripts/ui/lib/View.js @@ -60,7 +60,10 @@ var View = (function($, _){ var eventName = match[1], selector = match[2]; method = _.bind(method, this); eventName += '.delegateEvents' + this._id; - if (selector === '') { + if (is_mobile && (selector === 'mouseenter' || selector === 'mouseleave')) { + continue + } + else if (selector === '') { this.$el.on(eventName, method); } else { this.$el.on(eventName, selector, method); diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js index 27c8aca..076a674 100644 --- a/public/assets/javascripts/ui/site/ProjectList.js +++ b/public/assets/javascripts/ui/site/ProjectList.js @@ -1,5 +1,5 @@ var projectListTimeout = null -window.fuck = 'suck' + var ProjectList = View.extend({ el: ".projectList", |