From d729d5f58fa4a4a30e252ab063bcf636559945b0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 14 Nov 2014 16:43:26 -0500
Subject: soundcloud support

---
 public/assets/javascripts/ui/editor/MediaViewer.js |  5 +++++
 public/assets/javascripts/ui/lib/Parser.js         | 17 ++++++++++-------
 public/assets/javascripts/ui/reader/MediaPlayer.js |  3 +++
 3 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'public/assets/javascripts/ui')

diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 9593ab7..4af94e5 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -190,6 +190,10 @@ var MediaViewer = ModalView.extend({
 				image.src = media.url
 				image.load()
 				break
+			
+			case 'soundcloud':
+				image.src = media.thumbnail
+			  break
 		}
 		
 		$span.data("media", media)
@@ -250,6 +254,7 @@ var MediaViewer = ModalView.extend({
 
 		switch (media.type) {
 			case "video":
+			case "soundcloud":
 				$floatingImg.attr('src', '/assets/img/playbutton.png')
 				break
 			
diff --git a/public/assets/javascripts/ui/lib/Parser.js b/public/assets/javascripts/ui/lib/Parser.js
index d68f58b..87d52ef 100644
--- a/public/assets/javascripts/ui/lib/Parser.js
+++ b/public/assets/javascripts/ui/lib/Parser.js
@@ -115,7 +115,6 @@ var Parser = {
 			return '<div class="video" style="width: ' + media.width + 'px; height: ' + media.height + 'px; overflow: hidden; position: relative;"><iframe frameborder="0" scrolling="no" seamless="seamless" webkitallowfullscreen="webkitAllowFullScreen" mozallowfullscreen="mozallowfullscreen" allowfullscreen="allowfullscreen" id="okplayer" src="http://player.vimeo.com/video/' + media.token + '?api=1&title=0&byline=0&portrait=0&playbar=0&player_id=okplayer&loop=0&autoplay=0" width="' + media.width + '" height="' + media.height + '" style="position: absolute; top: 0px; left: 0px; width: ' + media.width + 'px; height: ' + media.height + 'px;"></iframe></div>'
 		}
 	},
-	/*
 	{
 		type: 'soundcloud',
 		regex: /soundcloud.com\/[-a-zA-Z0-9]+\/[-a-zA-Z0-9]+\/?$/i,
@@ -127,24 +126,28 @@ var Parser = {
 					+ '&client_id=' 
 					+ '0673fbe6fc794a7750f680747e863b10',
 				success: function(result) {
+				  // console.log(result)
 					done({
 						url: url,
 						type: "soundcloud",
 						token: result.id,
-						thumbnail: "",
-						title: "",
-						width: 100,
-						height: 100,
+						thumbnail: result.artwork_url || result.user.avatar_url,
+						title: result.title,
+						description: result.user.username,
+						width: 166,
+						height: 166,
 					})
 				}
 			});
 		},
 		tag: function (media) {
-			return '<iframe width="400" height="166" scrolling="no" frameborder="no"' +
+			return '<iframe width="166" height="166" scrolling="no" frameborder="no"' +
 					'src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/' + media.token +
 					'&amp;color=ff6600&amp;auto_play=false&amp;show_artwork=true"></iframe>'
 		}
-	}, {
+	},
+  /*
+	{
 		type: 'link',
 		regex: /^http.+/i,
 		fetch: function(url, done) {
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index 42e7596..f5a0d2c 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -49,6 +49,9 @@ var MediaPlayer = FormView.extend({
 				return false
 			}
 		}
+		else if (media.type == "text") {
+		  return false
+		}
 
 		this.bind(scenery)
 		this.$el.addClass("active")
-- 
cgit v1.2.3-70-g09d2