From a9e017a216d3893466d9f123f06a77cc50410f8f Mon Sep 17 00:00:00 2001
From: PiasyXu <xz4215@gmail.com>
Date: Sat, 19 Apr 2014 01:30:25 +0800
Subject: [PATCH] fix a bug when import iframe-code from player.vimeo.com

---
 build/js/timeline.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/build/js/timeline.js b/build/js/timeline.js
index c782752..92242e2 100644
--- a/build/js/timeline.js
+++ b/build/js/timeline.js
@@ -4651,7 +4651,22 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
 			media.hd	= VMM.Util.getUrlVars(d)["hd"];
 		    media.type = "youtube";
 		    success = true;
-		} else if (d.match('(player.)?vimeo\.com')) {
+		} else if (d.match('iframe')) {
+			media.type = "iframe";
+			trace("IFRAME")
+			regex = /src=['"](\S+?)['"]\s/;
+			group = d.match(regex);
+			if (group) {
+				media.id = group[1];
+			}
+			trace( "iframe url: " + media.id );
+			success = Boolean(media.id);
+		} 
+		//Due to vimeo website need login to play the video, it not very convenient.
+		//But use the iframe of player.vimeo.com site will go into 
+		//this if-clause first, so just move the iframe-if-clause before the vimeo-if-clause will
+		//be OK.
+		else if (d.match('(player.)?vimeo\.com')) {
 		    media.type = "vimeo";
 		    media.id = d.split(/video\/|\/\/vimeo\.com\//)[1].split(/[?&]/)[0];;
 		    success = true;
@@ -4735,16 +4750,6 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
 			media.type = "quote";
 			media.id = d;
 			success = true;
-		} else if (d.match('iframe')) {
-			media.type = "iframe";
-			trace("IFRAME")
-			regex = /src=['"](\S+?)['"]\s/;
-			group = d.match(regex);
-			if (group) {
-				media.id = group[1];
-			}
-			trace( "iframe url: " + media.id );
-			success = Boolean(media.id);
 		} else {
 			trace("unknown media");  
 			media.type = "unknown";