Skip to content

Commit c548706

Browse files
ritz078ritz078
committed
chore(merge): conflicts resolved
2 parents 5907488 + b26a6b2 commit c548706

45 files changed

Lines changed: 1779 additions & 1021 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc‎

Lines changed: 37 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"env": {
33
"node": true,
44
"es6": true,
5-
"browser":true
5+
"browser": true
66
},
77
"parser": "babel-eslint",
88
"extends": "eslint:recommended",
@@ -26,47 +26,41 @@
2626
"camelcase": 0,
2727
"no-console": 0
2828
},
29-
"globals":{
30-
"hljs":true,
31-
"twttr":true,
32-
"fetchJsonp":true,
33-
"videojs":true,
34-
"marked":true,
35-
"EMOJI" : true,
36-
"LINK" : true,
37-
"TWITTER" : true,
38-
"SMILEY" : true,
39-
"HIGHLIGHTCODE" : true,
40-
41-
"MARKDOWN" : true,
42-
43-
"MAP" : true,
44-
45-
"YOUTUBE" : true,
46-
"VIMEO" : true,
47-
"TED" : true,
48-
"DAILYMOTION" : true,
49-
"USTREAM" : true,
50-
"LIVELEAK" : true,
51-
"VINE" : true,
52-
"YOUTUBE" : true,
53-
"BASICVIDEO" : true,
54-
55-
56-
"SPOTIFY" : true,
57-
"SOUNDCLOUD" : true,
58-
"BASICAUDIO" : true,
59-
60-
"CODEPEN" : true,
61-
"IDEONE" : true,
62-
"JSBIN" : true,
63-
"JSFIDDLE" : true,
64-
"PLUNKER" : true,
65-
"GIST" : true,
66-
67-
"FLICKR" : true,
68-
"BASICIMAGE" : true,
69-
"INSTAGRAM" : true,
70-
"ejs":true
29+
"globals": {
30+
"hljs": true,
31+
"twttr": true,
32+
"fetchJsonp": true,
33+
"videojs": true,
34+
"marked": true,
35+
"EMOJI": true,
36+
"LINK": true,
37+
"TWITTER": true,
38+
"SMILEY": true,
39+
"HIGHLIGHTCODE": true,
40+
"MARKDOWN": true,
41+
"MAP": true,
42+
"YOUTUBE": true,
43+
"VIMEO": true,
44+
"TED": true,
45+
"DAILYMOTION": true,
46+
"USTREAM": true,
47+
"LIVELEAK": true,
48+
"VINE": true,
49+
"BASICVIDEO": true,
50+
"SPOTIFY": true,
51+
"SOUNDCLOUD": true,
52+
"BASICAUDIO": true,
53+
"CODEPEN": true,
54+
"IDEONE": true,
55+
"JSBIN": true,
56+
"JSFIDDLE": true,
57+
"PLUNKER": true,
58+
"GIST": true,
59+
"FLICKR": true,
60+
"BASICIMAGE": true,
61+
"INSTAGRAM": true,
62+
"OPENGRAPH": true,
63+
"ejs": true,
64+
"GITHUB":true
7165
}
7266
}

‎build.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,8 @@
3333

3434
"FLICKR" : "true",
3535
"BASICIMAGE" : "true",
36-
"INSTAGRAM" : "true"
36+
"INSTAGRAM" : "true",
37+
38+
"OPENGRAPH" : "true",
39+
"GITHUB" : "true"
3740
}

‎demo/index.html‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@
3131
<body>
3232

3333
<h1>Loading embed.js in a block</h1>
34-
34+
<div id="url" class="block">
35+
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Itaque consectetur iure culpa reiciendis repudiandae vitae quae temporibus eum fugit, porro accusamus https://github.com/ritz078/embed.js quis quas sapiente, deleniti! Suscipit excepturi ipsa nobis corrupti.
36+
</div>
3537
<div id="block">
3638

3739
#embed.js
3840

39-
Lorem ipsum dolor sit amet, :smile: consectetur adipisicing elit. Cum quos numquam, error optio voluptatibus, voluptates debitis dolorum possimus ducimus recusandae cupiditate. Veritatis cumque laboriosam debitis numquam iste amet provident vero. Lorem ipsum dolor **sit amet, consectetur adipisicing** elit. A, cupiditate fugiat, nemo asperiores tempora doloribus neque, molestias, harum consequuntur molestiae magnam officia quos facere tenetur dignissimos ~~animi beatae~~. Eius, ipsum. http://iitr.ac.in Lorem ipsum :+1: dolor sit amet, consectetur adipisicing elit. Fugit porro voluptas, nam doloremque ![abcdefg](https://images.unsplash.com/photo-1443527216320-7e744084f5a7?dpr=2&fit=crop&fm=jpg&h=500&ixlib=rb-0.3.5&q=50&w=1450) , incidunt architecto minima quod vel. Dicta accusantium molestias quaerat ut, nostrum, quidem id sapiente adipisci ullam architecto. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cum quos numquam, error optio voluptatibus, voluptates debitis dolorum possimus ducimus https://www.youtube.com/watch?v=bQRLVxZHKPs recusandae cupiditate. Veritatis cumque laboriosam debitis numquam iste amet provident vero. Lorem ipsum dolor sit amet, consectetur adipisicing elit. A, cupiditate fugiat, nemo asperiores tempora doloribus neque, molestias, harum consequuntur molestiae magnam officia quos facere tenetur dignissimos animi beatae. Eius, ipsum. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Fugit porro voluptas, nam doloremque, incidunt architecto minima quod vel. Dicta accusantium molestias quaerat ut, nostrum, quidem id sapiente adipisci ullam architecto. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cum quos numquam, error optio voluptatibus, voluptates debitis dolorum possimus ducimus recusandae http://www.sample-videos.com/video/mp4/240/big_buck_bunny_240p_50mb.mp4 cupiditate. Veritatis cumque laboriosam debitis numquam iste amet provident vero. Lorem ipsum dolor sit amet, consectetur adipisicing elit. A, cupiditate fugiat, nemo asperiores tempora doloribus neque, molestias, harum consequuntur molestiae magnam officia quos facere tenetur dignissimos animi beatae. Eius, ipsum. Lorem ipsum dolor sit amet, consectetur https://twitter.com/IGN/status/652941146054881281 adipisicing elit. Fugit porro voluptas, nam doloremque, incidunt architecto minima quod vel. Dicta accusantium molestias quaerat ut, nostrum, quidem id sapiente adipisci ullam architecto. Lorem ipsum dolor sit amet,
41+
Lorem ipsum dolor sit amet, :smile: consectetur adipisicing elit. Cum quos numquam, error optio voluptatibus, voluptates debitis dolorum possimus ducimus recusandae cupiditate. http://riteshkr.com/embed.js/ Veritatis cumque laboriosam debitis numquam iste amet provident vero. Lorem ipsum dolor **sit amet, consectetur adipisicing** elit. A, cupiditate fugiat, nemo asperiores tempora doloribus neque, molestias, harum consequuntur molestiae magnam officia quos facere tenetur dignissimos ~~animi beatae~~. Eius, ipsum. Lorem ipsum :+1: dolor sit amet, consectetur adipisicing elit. Fugit porro voluptas, nam doloremque ![abcdefg](https://images.unsplash.com/photo-1443527216320-7e744084f5a7?dpr=2&fit=crop&fm=jpg&h=500&ixlib=rb-0.3.5&q=50&w=1450) , incidunt architecto minima quod vel. Dicta accusantium molestias quaerat ut, nostrum, quidem id sapiente adipisci ullam architecto. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cum quos numquam, error optio voluptatibus, voluptates debitis dolorum possimus ducimus https://www.youtube.com/watch?v=bQRLVxZHKPs recusandae cupiditate. Veritatis cumque laboriosam debitis numquam iste amet provident vero. Lorem ipsum dolor sit amet, consectetur adipisicing elit. A, cupiditate fugiat, nemo asperiores tempora doloribus neque, molestias, harum consequuntur molestiae magnam officia quos facere tenetur dignissimos animi beatae. Eius, ipsum. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Fugit porro voluptas, nam doloremque, incidunt architecto minima quod vel. Dicta accusantium molestias quaerat ut, nostrum, quidem id sapiente adipisci ullam architecto. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cum quos numquam, error optio voluptatibus, voluptates debitis dolorum possimus ducimus recusandae http://www.sample-videos.com/video/mp4/240/big_buck_bunny_240p_50mb.mp4 cupiditate. Veritatis cumque laboriosam debitis numquam iste amet provident vero. Lorem ipsum dolor sit amet, consectetur adipisicing elit. A, cupiditate fugiat, nemo asperiores tempora doloribus neque, molestias, harum consequuntur molestiae magnam officia quos facere tenetur dignissimos animi beatae. Eius, ipsum. Lorem ipsum dolor sit amet, consectetur https://twitter.com/IGN/status/652941146054881281 adipisicing elit. Fugit porro voluptas, nam doloremque, incidunt architecto minima quod vel. Dicta accusantium molestias quaerat ut, nostrum, quidem id sapiente adipisci ullam architecto. Lorem ipsum dolor sit amet,
4042

4143
```
4244
grade = (student, period=(if b? then 7 else 6)) ->
@@ -48,7 +50,7 @@ <h1>Loading embed.js in a block</h1>
4850
"C"
4951
```
5052

51-
consectetur adipisicing elit. Cum quos numquam, error optio voluptatibus, voluptates debitis dolorum possimus ducimus recusandae cupiditate. Veritatis cumque laboriosam debitis numquam iste amet provident vero. Lorem ipsum dolor sit amet, consectetur adipisicing elit. A, cupiditate fugiat, nemo asperiores tempora doloribus neque, molestias, harum consequuntur molestiae magnam officia quos facere tenetur dignissimos animi beatae. Eius, ipsum. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Fugit porro voluptas, nam doloremque, incidunt architecto https://soundcloud.com/the-bugle/bugle-179-playas-gon-play minima quod vel. Dicta accusantium molestias quaerat ut, nostrum, quidem id sapiente adipisci ullam architecto. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cum quos numquam, error optio voluptatibus, voluptates debitis dolorum possimus ducimus recusandae cupiditate. Veritatis cumque laboriosam debitis numquam iste amet provident vero. Lorem ipsum dolor sit amet, consectetur adipisicing elit. A, cupiditate fugiat, nemo asperiores tempora http://open.spotify.com/track/4th1RQAelzqgY7wL53UGQt doloribus neque, molestias, harum consequuntur molestiae magnam officia quos facere tenetur dignissimos animi beatae. Eius, ipsum. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Fugit porro voluptas, nam doloremque, incidunt architecto minima quod vel. Dicta accusantium https://vine.co/v/bjHh0zHdgZT molestias quaerat ut, nostrum, quidem id sapiente adipisci ullam architecto. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Est nobis vero incidunt quod earum totam, corporis voluptatibus https://vimeo.com/119199079 ab voluptate nesciunt consequuntur eligendi natus voluptatem obcaecati quo. Dolor nostrum vel commodi! Lorem ipsum dolor sit amet, consectetur adipisicing elit. Mollitia velit ipsam eos facere http://www.dailymotion.com/video/x2k8un2_2015-wc-nz-vs-wi-holder-reacts-on-guptills-237_sport molestias explicabo quia odit dignissimos ipsa iusto enim, harum debitis neque amet, optio voluptatum odio nisi eius.
53+
consectetur adipisicing elit. Cum quos numquam, error optio voluptatibus https://github.com/ritz078/embed.js/issues/82 , voluptates debitis dolorum possimus ducimus recusandae cupiditate. Veritatis cumque laboriosam debitis numquam iste amet provident vero. Lorem ipsum dolor sit amet, consectetur adipisicing elit. A, cupiditate fugiat, nemo asperiores tempora doloribus neque, molestias, harum consequuntur molestiae magnam officia quos facere tenetur dignissimos animi beatae. Eius, ipsum. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Fugit porro voluptas, nam doloremque, incidunt architecto https://soundcloud.com/the-bugle/bugle-179-playas-gon-play minima quod vel. Dicta accusantium molestias quaerat ut, nostrum, quidem id sapiente adipisci ullam architecto. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cum quos numquam, error optio voluptatibus, voluptates debitis dolorum possimus ducimus recusandae cupiditate. Veritatis cumque laboriosam debitis numquam iste amet provident vero. Lorem ipsum dolor sit amet, consectetur adipisicing elit. A, cupiditate fugiat, nemo asperiores tempora http://open.spotify.com/track/4th1RQAelzqgY7wL53UGQt doloribus neque, molestias, harum consequuntur molestiae magnam officia quos facere tenetur dignissimos animi beatae. Eius, ipsum. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Fugit porro voluptas, nam doloremque, incidunt architecto minima quod vel. Dicta accusantium https://vine.co/v/bjHh0zHdgZT molestias quaerat ut, nostrum, quidem id sapiente adipisci ullam architecto. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Est nobis vero incidunt quod earum totam, corporis voluptatibus https://vimeo.com/119199079 ab voluptate nesciunt consequuntur eligendi natus voluptatem obcaecati quo. Dolor nostrum vel commodi! Lorem ipsum dolor sit amet, consectetur adipisicing elit. Mollitia velit ipsam eos facere http://www.dailymotion.com/video/x2k8un2_2015-wc-nz-vs-wi-holder-reacts-on-guptills-237_sport molestias explicabo quia odit dignissimos ipsa iusto enim, harum debitis neque amet, optio voluptatum odio nisi eius.
5254
</div>
5355
<div class="block">
5456
Cur rumor nocere?Emeritis adelphis satis perderes domina est.Gloss cadunt in bi-color brema!
@@ -69,10 +71,17 @@ <h1>Loading embed.js in a block</h1>
6971
videoJS:true,
7072
videoWidth:720,
7173
videoDetails:true,
74+
excludeEmbed:['spotify'],
75+
// openGraphEndpoint:'https://opengraph.io/api/1.0/site/${url}',
76+
openGraphExclude:['github'],
7277
googleAuthKey:'AIzaSyCqFouT8h5DKAbxlrTZmjXEmNBjC69f0ts',
7378
inlineEmbed:'all',
7479
marked:true,
75-
link:true
80+
link:true,
81+
onOpenGraphFetch:function(data){
82+
data.hybridGraph.success = data.error ? false : true;
83+
return data.hybridGraph;
84+
}
7685
});
7786
var x = new EmbedJS({
7887
element: document.getElementById('block'),
@@ -84,12 +93,14 @@ <h1>Loading embed.js in a block</h1>
8493
console.log(data);
8594
});
8695

96+
8797
ejs.template.basicAudio = function(match){
8898
return 'kjkh'+ match
8999
};
90100

91101

92102
ejs.applyEmbedJS(".block");
103+
93104
</script>
94105

95106
</body>

‎dist/embed.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/embed.min.js‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@
6262
"grunt-spritesmith": "^6.1.0",
6363
"mocha": "^2.3.4",
6464
"promise": "^7.1.1",
65-
"rollup": "^0.22.0",
66-
"rollup-plugin-babel": "^2.x",
67-
"rollup-plugin-commonjs": "^2.0.0",
68-
"rollup-plugin-npm": "^1.1.0",
65+
"rollup": "^0.23.0",
66+
"rollup-plugin-babel": "^2.3.3",
67+
"rollup-plugin-commonjs": "^2.1.0",
68+
"rollup-plugin-npm": "^1.2.0",
6969
"rollup-plugin-replace": "^1.1.0"
7070
},
7171
"scripts": {

0 commit comments

Comments
 (0)