summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/lib
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/ui/lib')
-rw-r--r--public/assets/javascripts/ui/lib/FormView.js8
-rw-r--r--public/assets/javascripts/ui/lib/View.js5
2 files changed, 12 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/lib/FormView.js b/public/assets/javascripts/ui/lib/FormView.js
index 17b748a..b3a4c71 100644
--- a/public/assets/javascripts/ui/lib/FormView.js
+++ b/public/assets/javascripts/ui/lib/FormView.js
@@ -1,6 +1,7 @@
var FormView = View.extend({
method: "post",
+ useMinotaur: false,
events: {
"submit form": "save"
@@ -88,8 +89,15 @@ var FormView = View.extend({
processData: false,
contentType: false,
})
+
+ if (this.useMinotaur) {
+ Minotaur.show()
+ }
request.done($.proxy(function (response) {
+ if (this.useMinotaur) {
+ Minotaur.hide()
+ }
if (response.error) {
var errors = []
for (var key in response.error.errors) {
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);