Merge branch 'release/0.2.3'

changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 0.2.3 (2017-02-05)
+  - Autolink/embed youtube videos and spotify links
+
 ## Version 0.2.2 (2017-02-05)
   - Fix: allow syndication to work again (issue#42)
 

public/assets/js/links.js

@@ -0,0 +1 @@
+!function(t){function e(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return t[n].call(o.exports,o,o.exports,e),o.l=!0,o.exports}var r={};return e.m=t,e.c=r,e.i=function(t){return t},e.d=function(t,r,n){e.o(t,r)||Object.defineProperty(t,r,{configurable:!1,enumerable:!0,get:n})},e.n=function(t){var r=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(r,"a",r),r},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=18)}({18:function(t,e){var r=/watch\?v=([A-Za-z0-9\-_]+)\b/,n=/https\:\/\/play\.spotify\.com\/(.*)\b/,o=document.querySelectorAll(".e-content"),a=!0,u=!1,i=void 0;try{for(var c,l=o[Symbol.iterator]();!(a=(c=l.next()).done);a=!0){var s=c.value,f=s.textContent.match(r);if(f){var p=document.createElement("iframe");p.classList.add("youtube"),p.setAttribute("src","https://www.youtube.com/embed/"+f[1]),p.setAttribute("frameborder",0),p.setAttribute("allowfullscreen","true"),s.appendChild(p)}var d=s.textContent.match(n);if(d){var b=d[1].replace("/",":"),m=document.createElement("iframe");m.classList.add("spotify"),m.setAttribute("src","https://embed.spotify.com/?uri=spotify:"+b),m.setAttribute("frameborder",0),m.setAttribute("allowtransparency","true"),s.appendChild(m)}}}catch(t){u=!0,i=t}finally{try{!a&&l.return&&l.return()}finally{if(u)throw i}}}});

resources/assets/es6/links.js

@@ -0,0 +1,28 @@
+//links.js
+
+let youtubeRegex = /watch\?v=([A-Za-z0-9\-_]+)\b/;
+let spotifyRegex = /https\:\/\/play\.spotify\.com\/(.*)\b/;
+
+let notes = document.querySelectorAll('.e-content');
+
+for (let note of notes) {
+    let ytid = note.textContent.match(youtubeRegex);
+    if (ytid) {
+        let ytiframe = document.createElement('iframe');
+        ytiframe.classList.add('youtube');
+        ytiframe.setAttribute('src', 'https://www.youtube.com/embed/' + ytid[1]);
+        ytiframe.setAttribute('frameborder', 0);
+        ytiframe.setAttribute('allowfullscreen', 'true');
+        note.appendChild(ytiframe);
+    }
+    let spotifyid = note.textContent.match(spotifyRegex);
+    if (spotifyid) {
+        let sid = spotifyid[1].replace('/', ':');
+        let siframe = document.createElement('iframe');
+        siframe.classList.add('spotify');
+        siframe.setAttribute('src', 'https://embed.spotify.com/?uri=spotify:' + sid);
+        siframe.setAttribute('frameborder', 0);
+        siframe.setAttribute('allowtransparency', 'true');
+        note.appendChild(siframe);
+    }
+}

resources/views/allnotes.blade.php

@@ -20,12 +20,11 @@ Notes «
 
 @section('scripts')
 
-<!--<script src="/assets/frontend/Autolinker.min.js"></script>
-<script src="/assets/js/links.js"></script>-->
+<script defer src="/assets/js/links.js"></script>
 <link rel="stylesheet" href="/assets/frontend/mapbox-gl.css">
 <script defer src="/assets/js/maps.js"></script>
 
-<script src="/assets/prism/prism.js"></script>
+<script defer src="/assets/prism/prism.js"></script>
 <link rel="stylesheet" href="/assets/prism/prism.css">
 @stop
 

resources/views/singlenote.blade.php

@@ -1,7 +1,7 @@
 @extends('master')
 
 @section('title')
-{{ strip_tags($note->note) }} « Notes « 
+{{ strip_tags($note->note) }} « Notes «
 @stop
 
 @section('content')
@@ -34,11 +34,10 @@
 @stop
 
 @section('scripts')
-@include('templates.mapbox-links')
 
-<script src="/assets/frontend/Autolinker.min.js"></script>
-<script src="/assets/js/links.js"></script>
-<script src="/assets/js/maps.js"></script>
+<script defer src="/assets/js/links.js"></script>
+<link rel="stylesheet" href="/assets/frontend/mapbox-gl.css">
+<script defer src="/assets/js/maps.js"></script>
 
 <script src="/assets/prism/prism.js"></script>
 <link rel="stylesheet" href="/assets/prism/prism.css">

webpack.config.js

@@ -4,6 +4,7 @@ const config = {
   context: __dirname + '/resources/assets/es6',
   entry: {
     //app: './app.js',
+    links: './links.js',
     maps: './maps.js',
     newnote: './newnote.js'
   },