fix(instagram and flickr): fixed issue of inline embedding

Author: ritz078

demo/index.html

@@ -55,7 +55,7 @@ <h1>Loading embed.js in a block</h1>
 Cur rumor nocere?Emeritis adelphis satis perderes domina est.Gloss cadunt in bi-color brema!
 @(IIT Roorkee) Bi-color habitio virtualiter imitaris amicitia est.Teres tatas ducunt ad racana.Genetrixs
 prarere in
-rugensis civitas! :) https://www.instagram.com/p/_JHaOcjJ7h/?taken-by=9gag https://www.instagram.com/p/-mIWFsIVV-/?taken-by=natgeo
+rugensis civitas! :) https://www.instagram.com/p/_JHaOcjJ7h/?taken-by=9gag https://www.instagram.com/p/-mIWFsIVV-/?taken-by=natgeo https://www.flickr.com/photos/43301211@N03/23331635460/in/explore-2015-12-09/
 </div>
 </div>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/marked/0.3.5/marked.min.js"></script>
@@ -78,20 +78,21 @@ <h1>Loading embed.js in a block</h1>
 	var x = new EmbedJS({
 		element: document.getElementById('block')
 	});
-	x.render()
+	x.render();
 	// x.render();
 	var y = new EmbedJS({
-		element: document.getElementById('block2')
+		element: document.getElementById('block2'),
+		inlineEmbed:'all'
 	});
-	y.render()
+	y.render();
 
 	x.text(function(data){
 		console.log(data);
-	})
+	});
 
 	ejs.template.basicAudio = function(match){
 		return 'kjkh'+ match
-	}
+	};
 
 
 	// ejs.applyEmbedJS("block");

dist/embed.min.js

@@ -10,7 +10,8 @@ class Base {
 
 	process() {
 		if (!utils.ifInline(this.options, this.service)) {
-			let regexInline = this.options.link ? new RegExp(`([^>]*${this.regex.source})<\/a>`,'gm') : new RegExp(`([^\\s]*${this.regex.source})`,'gm')
+			let regexInline = this.options.link ? new RegExp(`([^>]*${this.regex.source})<\/a>`,'gm') : new RegExp(`([^\\s]*${this.regex.source})`,'gm');
+			console.log(regexInline);
 			this.output = this.output.replace(regexInline, (match)=> {
 				if(this.options.link){
 					return !this.options.inlineText ? this.template(match.slice(0, -4)) + '</a>' : match + this.template(match.slice(0,-4))

src/embed.js

@@ -4,15 +4,15 @@ import Base from '../base.es6'
 export class Flickr extends Base{
 	constructor(input, output,options, embeds){
 		super(input,output, options, embeds);
-		this.regex = /flickr.com\/[a-z]+\/[a-zA-Z@_$!\d]+\/[\d]+/gi;
+		this.regex = /flickr.com\/[a-z]+\/[a-zA-Z@_$!\d\-\]+\/[\d]+/gi;
 		this.service = 'flickr'
 	}
 
 	template(match){
 		let dimensions = utils.dimensions(this.options);
 		return ejs.template.flickr(match, dimensions, this.options) || `<div class="ejs-embed">
 			<div class="ne-image-wrapper">
-				<iframe src="${utils.toUrl(match)}/player/" width="${dimensions.width}" height="${dimensions.height}"></iframe>
+				<iframe src="${utils.toUrl(match.split('/?')[0])}/player/" width="${dimensions.width}" height="${dimensions.height}"></iframe>
 			</div>
 		</div>`
 	}

src/embed.js.map

@@ -4,13 +4,13 @@ import Base from '../base.es6'
 export class Instagram extends Base{
 	constructor(input, output,options, embeds){
 		super(input,output, options, embeds);
-		this.regex = /instagram.com\/p\/[a-zA-Z0-9_-]+/gi;
+		this.regex = /instagram.com\/p\/[a-zA-Z0-9_\/\?\-\=]+/gi;
 		this.service = 'instagram'
 	}
 
 	template(match){
 		let dimensions = utils.dimensions(this.options);
-		return ejs.template.instagram(match, dimensions, this.options) || `<div class="ejs-embed ejs-instagram"><iframe src="${utils.toUrl(match)}/embed/" height="${dimensions.height}"></iframe></div>`
+		return ejs.template.instagram(match, dimensions, this.options) || `<div class="ejs-embed ejs-instagram"><iframe src="${utils.toUrl(match.split('/?')[0])}/embed/" height="${dimensions.height}"></iframe></div>`
 	}
 }