merge

1 files changed, 119 insertions, 108 deletions

diff --git a/public/assets/javascripts/ui/lib/FormView.js b/public/assets/javascripts/ui/lib/FormView.js
index 17b748a..a952ecb 100644
--- a/public/assets/javascripts/ui/lib/FormView.js
+++ b/public/assets/javascripts/ui/lib/FormView.js
@@ -1,127 +1,138 @@
 var FormView = View.extend({
 
-	method: "post",
+  method: "post",
+  useMinotaur: false,
 
-	events: {
-		"submit form": "save"
-	},
+  events: {
+    "submit form": "save"
+  },
 
-	initialize: function(opt){
-		if (opt && opt.parent) {
-			this.parent = opt.parent
-		}
-		this.$form = this.$("form")
-		this.$errors = this.$(".errors")
-		this.$errorList = this.$(".errorList")
-	},
+  initialize: function(opt){
+    if (opt && opt.parent) {
+      this.parent = opt.parent
+    }
+    this.$form = this.$("form")
+    this.$errors = this.$(".errors")
+    this.$errorList = this.$(".errorList")
+  },
 
-	reset: function(){
-		this.$("input,textarea").not("[type='submit']").not("[type='hidden']").val("")
-	},
-	
-	showErrors: function(errors){
-		if (errors && errors.length) {
-			this.$errorList.empty();
-			for (var i in errors) {
-				this.$errorList.append('<div>' + errors[i] + '</div>');
-			}
-			this.$errors.css("opacity", 1.0);
-			setTimeout(function(){
-				this.$errors.show().css("opacity", 1.0);
-			}.bind(this), 200)
-		}
-	},
-	
-	serialize: function(){
-		var fd = new FormData(), hasCSRF = false
-		
-		this.$("input[name], select[name], textarea[name]").each( function(){
-			if (this.type == "file") {
-				if (this.files.length > 0) {
-					fd.append(this.name, this.files[0]);
-				}
-			}
-			else if (this.type == "password") {
-				if (this.value.length > 0) {
-					fd.append(this.name, SHA1.hex('lol$' + this.value + '$vvalls'))
-				}
-			}
-			else {
-				fd.append(this.name, this.value);
-				hasCSRF = hasCSRF || this.name == "_csrf"
-			}
-		});
-		
-		if (! hasCSRF) {
+  reset: function(){
+    this.$("input,textarea").not("[type='submit']").not("[type='hidden']").val("")
+  },
+  
+  showErrors: function(errors){
+    if (errors && errors.length) {
+      this.$errorList.empty();
+      for (var i in errors) {
+        this.$errorList.append('<div>' + errors[i] + '</div>');
+      }
+      this.$errors.css("opacity", 1.0);
+      setTimeout(function(){
+        this.$errors.show().css("opacity", 1.0);
+      }.bind(this), 200)
+    }
+  },
+  
+  serialize: function(){
+    var fd = new FormData(), hasCSRF = false
+    
+    this.$("input[name], select[name], textarea[name]").each( function(){
+      if (this.type == "file") {
+        if (this.files.length > 0) {
+          fd.append(this.name, this.files[0]);
+        }
+      }
+      else if (this.type == "password") {
+        if (this.value.length > 0) {
+          fd.append(this.name, SHA1.hex('lol$' + this.value + '$vvalls'))
+        }
+      }
+      else {
+        fd.append(this.name, this.value);
+        hasCSRF = hasCSRF || this.name == "_csrf"
+      }
+    });
+    
+    if (! hasCSRF) {
       fd.append("_csrf", $("[name=_csrf]").val())
     }
-		
-		return fd
-	},
-	
-	save: function(e, successCallback, errorCallback){
-		e && e.preventDefault()
+    
+    return fd
+  },
+  
+  save: function(e, successCallback, errorCallback){
+    e && e.preventDefault()
 
-		this.$errors.hide().css("opacity", 0.0);
-		
-		if (this.validate) {
-			var errors = this.validate()
-			if (errors && errors.length) {
-				if (errorCallback) {
-				  errorCallback(errors)
-				}
-				else {
+    this.$errors && this.$errors.hide().css("opacity", 0.0);
+    
+    if (this.validate) {
+      var errors = this.validate()
+      if (errors && errors.length) {
+        if (errorCallback) {
+          setTimeout(function(){
+            errorCallback(errors)
+          })
+        }
+        else {
           this.showErrors(errors)
-				}
-				return
-			}
-		}
-		
-		var action = typeof this.action == "function" ? this.action() : this.action
-		if (! action) return
+        }
+        return
+      }
+    }
+    var action = typeof this.action == "function" ? this.action() : this.action
+    if (! action) return
 
-		var request = $.ajax({
-			url: action,
-			type: this.method,
-			data: this.serialize(),
-			dataType: "json",
-			processData: false,
-			contentType: false,
-		})
-		
-		request.done($.proxy(function (response) {
-			if (response.error) {
-				var errors = []
-				for (var key in response.error.errors) {
-					errors.push(response.error.errors[key].message);
-				}
-				if (errorCallback) {
-				  errorCallback(errors)
-				}
-				else {
+    var request = $.ajax({
+      url: action,
+      type: this.method,
+      data: this.serialize(),
+      dataType: "json",
+      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) {
+          errors.push(response.error.errors[key].message);
+        }
+        if (errorCallback) {
+          errorCallback(errors)
+        }
+        else {
           this.showErrors(errors)
-				}
-				return
-			}
-			else {
-				if (successCallback) {
-				  successCallback(response)
-				}
-				if (this.success) {
-				  this.success(response)
-				}
-			}
-		}, this));
-	}
+        }
+        return
+      }
+      else {
+        console.log("ok")
+        if (successCallback) {
+        console.log("use cb")
+          successCallback(response)
+        }
+        if (this.success) {
+          this.success(response)
+        }
+      }
+    }, this));
+  }
 
 })
 
 
 var ModalFormView = ModalView.extend(FormView.prototype).extend({
 
-	load: function(){
-		this.reset()
-		this.show()
-	}
+  load: function(){
+    this.reset()
+    this.show()
+  }
 
 })