merge

1 files changed, 45 insertions, 34 deletions

diff --git a/public/assets/javascripts/ui/lib/ModalView.js b/public/assets/javascripts/ui/lib/ModalView.js
index d9b518a..e0070ce 100644
--- a/public/assets/javascripts/ui/lib/ModalView.js
+++ b/public/assets/javascripts/ui/lib/ModalView.js
@@ -1,42 +1,53 @@
 
 var ModalView = View.extend({
-	events: {
-		"click .close": 'close',
-	},
-	
-	initialize: function(opt){
-		if (opt && opt.parent) {
-			this.parent = opt.parent
-		}
-	},
-	
-	usesFileUpload: false,
-	
-	show: function(){
-		$(".mediaDrawer").removeClass("active")
-		
-		if (! this.usesFileUpload) {
-		  $(".fileUpload").removeClass("active")
-		}
-		
-		this.$el.addClass("active")
+  events: {
+    "click .close": 'close',
+  },
+  
+  initialize: function(opt){
+    if (opt && opt.parent) {
+      this.parent = opt.parent
+    }
+  },
+  
+  usesFileUpload: false,
+  
+  show: function(){
+    $(".mediaDrawer").removeClass("active")
+    $(".fileUpload").removeClass("active")
+
+    if (this.fixedClose) {
+      $("#fixed_close").addClass("active")
+      $("#fixed_close").bind("click", this.hide.bind(this))
+    }
+    
+    this.$el.addClass("active")
     $("body").addClass("noOverflow")
-	},
+  },
 
-	hide: function(){
+  hide: function(){
     // $(".mediaDrawer, .room1").removeClass("active editing");
-		this.$el.removeClass("active");
+    if (this.fixedClose) {
+      $("#fixed_close").removeClass("active")
+      $("#fixed_close").unbind("click", this.hide.bind(this))
+    }
+    this.$el.removeClass("active");
     $("body").removeClass("noOverflow");
-	},
-	
-	close: function(){
-		if (window.isModalView) {
-			window.location.pathname = "/"
-		}
-		else {
-			history.pushState(null, document.title, app.router.originalPath)
-			this.hide()
-		}
-	}
+  },
+  
+  hideClose: function(){
+    $("#fixed_close").removeClass("active")
+    $("#fixed_close").unbind("click", this.hide.bind(this))
+  },
+  
+  close: function(){
+    if (window.isModalView) {
+      window.location.pathname = "/"
+    }
+    else {
+      history.pushState(null, document.title, app.router.originalPath)
+      this.hide()
+    }
+  }
 
 })