4 files changed, 39 insertions, 17 deletions
diff --git a/public/assets/javascripts/ui/lib/FormView.js b/public/assets/javascripts/ui/lib/FormView.js
index 219952d..ab33bc0 100644
--- a/public/assets/javascripts/ui/lib/FormView.js
+++ b/public/assets/javascripts/ui/lib/FormView.js
@@ -54,15 +54,20 @@ var FormView = View.extend({
 		return fd
 	},
 	
-	save: function(e){
-		e.preventDefault()
+	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) {
-				this.showErrors(errors)
+				if (errorCallback) {
+				  errorCallback(errors)
+				}
+				else {
+          this.showErrors(errors)
+				}
 				return
 			}
 		}
@@ -74,18 +79,29 @@ var FormView = View.extend({
 			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);
 				}
-				this.showErrors(errors)
+				if (errorCallback) {
+				  errorCallback(errors)
+				}
+				else {
+          this.showErrors(errors)
+				}
 				return
 			}
 			else {
-				this.success && this.success(response)
+				if (successCallback) {
+				  successCallback(response)
+				}
+				if (this.success) {
+				  this.success(response)
+				}
 			}
 		}, this));
 	}
diff --git a/public/assets/javascripts/ui/lib/ModalView.js b/public/assets/javascripts/ui/lib/ModalView.js
index 957a54d..937c1e9 100644
--- a/public/assets/javascripts/ui/lib/ModalView.js
+++ b/public/assets/javascripts/ui/lib/ModalView.js
@@ -11,9 +11,10 @@ var ModalView = View.extend({
 	},
 	
 	show: function(){
-		$(".mediaDrawer").removeClass("active");
-		this.$el.addClass("active");
-    $("body").addClass("noOverflow");
+		$(".mediaDrawer").removeClass("active")
+		$(".fileUpload").removeClass("active")
+		this.$el.addClass("active")
+    $("body").addClass("noOverflow")
 	},
 
 	hide: function(){
diff --git a/public/assets/javascripts/ui/lib/Parser.js b/public/assets/javascripts/ui/lib/Parser.js
index dfff7b2..1cf0418 100644
--- a/public/assets/javascripts/ui/lib/Parser.js
+++ b/public/assets/javascripts/ui/lib/Parser.js
@@ -86,6 +86,10 @@ var Parser = {
 				success: function(result){
 					if (result.length == 0) { return done(id, "", 640, 360) }
 					var res = result[0]
+					if (res.embed_privacy != "anywhere") {
+					  AlertModal.alert("Sorry, the author of this video has marked it private, preventing it from being embedded.", function(){})
+					  return
+					}
 					done({
 						token: id,
 						thumbnail: res.thumbnail_large,
diff --git a/public/assets/javascripts/ui/lib/View.js b/public/assets/javascripts/ui/lib/View.js
index 999a0e5..d94e6db 100644
--- a/public/assets/javascripts/ui/lib/View.js
+++ b/public/assets/javascripts/ui/lib/View.js
@@ -1,13 +1,14 @@
 var View = (function($, _){
 
 	var View = function(options) {
-		this.cid = _.uniqueId('view');
+		this._id = _.uniqueId('view')
+		this.type = "view"
 		options || (options = {});
-		_.extend(this, _.pick(options, viewOptions));
-		this._ensureElement();
-		this.initialize.apply(this, arguments);
-		this.delegateEvents();
-	};
+		_.extend(this, _.pick(options, viewOptions))
+		this._ensureElement()
+		this.initialize.apply(this, arguments)
+		this.delegateEvents()
+	}
 
 	var delegateEventSplitter = /^(\S+)\s*(.*)$/;
 
@@ -58,7 +59,7 @@ var View = (function($, _){
 				var match = key.match(delegateEventSplitter);
 				var eventName = match[1], selector = match[2];
 				method = _.bind(method, this);
-				eventName += '.delegateEvents' + this.cid;
+				eventName += '.delegateEvents' + this._id;
 				if (selector === '') {
 					this.$el.on(eventName, method);
 				} else {
@@ -70,7 +71,7 @@ var View = (function($, _){
 
 		// Clears all callbacks previously bound to the view with `delegateEvents`.
 		undelegateEvents: function() {
-			this.$el.off('.delegateEvents' + this.cid);
+			this.$el.off('.delegateEvents' + this._id);
 			return this;
 		},