merge

3 files changed, 29 insertions, 1 deletions

diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index 7f73e1b..e40c6ff 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -44,7 +44,7 @@ var MediaPlayer = FormView.extend({
 			this.unbind()
 		}
 		if (media.type == "image") {
-			if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length) || (media.title == filenameFromUrl(media.url)) ) {
+			if ( ! media.description && (! media.title || media.title == filenameFromUrl(media.url)) ) {
 				this.hide()
 				return
 			}
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 8531244..c132609 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -9,6 +9,7 @@ var ReaderView = View.extend({
 	
 	initialize: function(){
 		this.mediaPlayer = new MediaPlayer ({ parent: this })
+		this.shareView = new ShareView ({ parent: this })
 	},
 
 	load: function(name){
diff --git a/public/assets/javascripts/ui/reader/ShareView.js b/public/assets/javascripts/ui/reader/ShareView.js
new file mode 100644
index 0000000..35c23ca
--- /dev/null
+++ b/public/assets/javascripts/ui/reader/ShareView.js
@@ -0,0 +1,27 @@
+var ShareView = View.extend({
+  el: ".share",
+  
+  events: {
+    "click #share_facebook": "facebook",
+    "click #share_twitter": "twitter",
+  },
+
+	initialize: function(opt){
+	  this.parent = opt.parent
+	},
+
+	facebook: function (e) {
+	  e.preventDefault()
+	  var msg = $(".roomName").html() + " on VValls"
+		var url = "https://www.facebook.com/share.php?u=" + encodeURIComponent(window.location.origin + window.location.pathname) + "&t=" + encodeURIComponent(msg);
+		window.open(url, "_blank")
+	},
+
+	twitter: function (e) {
+	  e.preventDefault()
+	  var msg = $(".roomName").html() + " on VValls"
+		var url = "https://twitter.com/home?status=" + encodeURIComponent(window.location.origin + window.location.pathname + " " + msg);
+		window.open(url, "_blank")
+	}
+
+})