From 703fcb16684ecfba00ab5d98734ca698c5252f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Fri, 8 Aug 2014 14:39:50 +0100 Subject: [PATCH 1/4] Add support for asynchronous / lazy plugins Fixes #253 --- js/glowingbear.js | 6 ++++++ js/plugins.js | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/js/glowingbear.js b/js/glowingbear.js index a1ac3d8..0efde02 100644 --- a/js/glowingbear.js +++ b/js/glowingbear.js @@ -1343,6 +1343,12 @@ weechat.directive('plugin', function($rootScope) { * Actual plugin content is only fetched when * content is shown. */ + + // If the plugin is asynchronous / lazy, execute it now and store + // the result. This ensures that the callback is executed only once + if ($scope.plugin.content instanceof Function) { + $scope.plugin.content = $scope.plugin.content(); + } $scope.displayedContent = $scope.plugin.content; $scope.plugin.visible = true; diff --git a/js/plugins.js b/js/plugins.js index afd31af..16a4545 100644 --- a/js/plugins.js +++ b/js/plugins.js @@ -60,8 +60,14 @@ plugins.service('plugins', ['userPlugins', '$sce', function(userPlugins, $sce) { if (num) { pluginName += " " + num; } + + // If content isn't a callback, it's HTML + if (!(content instanceof Function)) { + content = $sce.trustAsHtml(content); + } + message.metadata.push({ - 'content': $sce.trustAsHtml(content), + 'content': content, 'nsfw': nsfw, 'name': pluginName }); From 3d719f3671503e4e6b594e9e68b7ee0e1fc2bdb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Fri, 8 Aug 2014 15:59:35 +0100 Subject: [PATCH 2/4] Simplify plugins that detect URLs by eliminating redundancy --- js/plugins.js | 85 ++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 49 deletions(-) diff --git a/js/plugins.js b/js/plugins.js index 16a4545..d795dbe 100644 --- a/js/plugins.js +++ b/js/plugins.js @@ -132,6 +132,21 @@ plugins.factory('userPlugins', function() { var urlRegexp = RegExp(/(?:ftp|https?):\/\/\S*[^\s.;,(){}<>]/g); + var urlPlugin = function(callback) { + return function(message) { + var urls = message.match(urlRegexp); + var content = []; + + for (var i = 0; urls && i < urls.length; i++) { + var result = callback(urls[i]); + if (result) { + content.push(result); + } + } + return content; + }; + }; + /* * Spotify Embedded Player * @@ -221,13 +236,8 @@ plugins.factory('userPlugins', function() { /* * Image Preview */ - var imagePlugin = new Plugin(function(message) { - - var urls = message.match(urlRegexp); - var content = []; - - for (var i = 0; urls && i < urls.length; i++) { - var url = urls[i]; + var imagePlugin = new Plugin( + urlPlugin(function(url) { if (url.match(/\.(png|gif|jpg|jpeg)$/i)) { /* A fukung.net URL may end by an image extension but is not a direct link. */ @@ -238,58 +248,40 @@ plugins.factory('userPlugins', function() { url = url.replace(/http:/, ""); } - content.push(''); + return ''; } - } - - return content; - }); + }) + ); imagePlugin.name = 'image'; /* * Cloud Music Embedded Players */ - var cloudmusicPlugin = new Plugin(function(message) { - - var urls = message.match(urlRegexp); - var content = []; - - for (var i = 0; urls && i < urls.length; i++) { - var url = urls[i]; - + var cloudmusicPlugin = new Plugin( + urlPlugin(function(url) { /* SoundCloud http://help.soundcloud.com/customer/portal/articles/247785-what-widgets-can-i-use-from-soundcloud- */ if (url.match(/^https?:\/\/soundcloud.com\//)) { - content.push(''); + return ''; } /* MixCloud */ if (url.match(/^https?:\/\/([a-z]+\.)?mixcloud.com\//)) { - content.push(''); + return ''; } - } - - return content; - }); + }) + ); cloudmusicPlugin.name = 'cloud music'; /* * Google Maps */ - var googlemapPlugin = new Plugin(function(message) { - - var urls = message.match(urlRegexp); - var content = []; - - for (var i = 0; urls && i < urls.length; i++) { - var url = urls[i]; - + var googlemapPlugin = new Plugin( + urlPlugin(function(url) { if (url.match(/^https?:\/\/maps\.google\./i) || url.match(/^https?:\/\/(?:[\w]+\.)?google\.[\w]+\/maps/i)) { - content.push(''); + return ''; } - } - - return content; - }); + }) + ); googlemapPlugin.name = 'Google Map'; /* @@ -306,12 +298,8 @@ plugins.factory('userPlugins', function() { }); asciinemaPlugin.name = "ascii cast"; - var yrPlugin = new Plugin(function(message) { - var urls = message.match(urlRegexp); - var content = []; - - for (var i = 0; urls && i < urls.length; i++) { - var url = urls[i]; + var yrPlugin = new Plugin( + urlPlugin(function(url) { var regexp = /^https?:\/\/(?:www\.)?yr\.no\/(place|stad|sted|sadji|paikka)\/(([^\s.;,(){}<>\/]+\/){3,})/; var match = url.match(regexp); if (match) { @@ -319,11 +307,10 @@ plugins.factory('userPlugins', function() { var location = match[2]; var city = match[match.length - 1].slice(0, -1); url = "http://www.yr.no/" + language + "/" + location + "avansert_meteogram.png"; - content.push("Meteogram for " + city + ""); + return "Meteogram for " + city + ""; } - } - return content; - }); + }) + ); yrPlugin.name = "meteogram"; return { From 6d988069c745a4b5ee0abc502597db4a8adb92f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Sat, 9 Aug 2014 14:17:36 +0100 Subject: [PATCH 3/4] Add asynchronous GitHub Gist embedding plugin requires a few selectors to be more precise in our CSS --- css/glowingbear.css | 27 ++++++++++++--------------- js/plugins.js | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/css/glowingbear.css b/css/glowingbear.css index 7f803ee..108fa9d 100644 --- a/css/glowingbear.css +++ b/css/glowingbear.css @@ -38,20 +38,6 @@ a { cursor: pointer; } -table { - width: 100%; -} -tr { - line-height: 100%; -} -tr:hover { - background-color: #222222; -} -td.time { - padding: 1px 5px 1px 1px; - vertical-align: top; -} - .repeated-time { } .repeated-time .cof-chat_time, @@ -281,8 +267,19 @@ input[type=text], input[type=password], #sendMessage, .badge { -webkit-transition:0.35s ease all; transition:0.35s ease all; } -#bufferlines table { +#bufferlines > table { margin-top: 35px; + width: 100%; +} +tr.bufferline { + line-height: 100%; +} +tr.bufferline:hover { + background-color: #222222; +} +td.time { + padding: 1px 5px 1px 1px; + vertical-align: top; } .withnicklist { diff --git a/js/plugins.js b/js/plugins.js index d795dbe..4febfc3 100644 --- a/js/plugins.js +++ b/js/plugins.js @@ -129,6 +129,19 @@ plugins.service('plugins', ['userPlugins', '$sce', function(userPlugins, $sce) { * */ plugins.factory('userPlugins', function() { + // standard JSONp origin policy trick + var jsonp = function (url, callback) { + var callbackName = 'jsonp_callback_' + Math.round(100000 * Math.random()); + window[callbackName] = function(data) { + delete window[callbackName]; + document.body.removeChild(script); + callback(data); + }; + + var script = document.createElement('script'); + script.src = url + (url.indexOf('?') >= 0 ? '&' : '?') + 'callback=' + callbackName; + document.body.appendChild(script); + }; var urlRegexp = RegExp(/(?:ftp|https?):\/\/\S*[^\s.;,(){}<>]/g); @@ -313,8 +326,33 @@ plugins.factory('userPlugins', function() { ); yrPlugin.name = "meteogram"; + // Embed GitHub gists + var gistPlugin = new Plugin( + urlPlugin(function(url) { + var regexp = /^https:\/\/gist\.github.com\/[^.?]+/i; + var match = url.match(regexp); + if (match) { + // get the URL from the match to trim away pseudo file endings and request parameters + url = match[0] + '.json'; + // load gist asynchronously -- return a function here + return function() { + var element = document.querySelector('.embed_' + this.$$hashKey); + jsonp(url, function(data) { + // Add the gist stylesheet only once + if (document.querySelectorAll('link[rel=stylesheet][href="' + data.stylesheet + '"]').length < 1) { + var stylesheet = ''; + document.getElementsByTagName('head')[0].innerHTML += stylesheet; + } + element.innerHTML = '
' + data.div + '
'; + }); + }; + } + }) + ); + gistPlugin.name = 'Gist'; + return { - plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin] + plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin] }; From 7d13f49dabd75be14676e27ec43ab8b297d738e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Fri, 8 Aug 2014 17:09:23 +0100 Subject: [PATCH 4/4] Add tweet embedding plugin --- js/plugins.js | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/js/plugins.js b/js/plugins.js index 4febfc3..0f356ce 100644 --- a/js/plugins.js +++ b/js/plugins.js @@ -351,8 +351,36 @@ plugins.factory('userPlugins', function() { ); gistPlugin.name = 'Gist'; + var tweetPlugin = new Plugin( + urlPlugin(function(url) { + var regexp = /^https?:\/\/twitter\.com\/(?:#!\/)?(\w+)\/status(?:es)?\/(\d+)/i; + var match = url.match(regexp); + if (match) { + url = 'https://api.twitter.com/1/statuses/oembed.json?id=' + match[2]; + return function() { + var element = document.querySelector('.embed_' + this.$$hashKey); + jsonp(url, function(data) { + // sepearate the HTML into content and script tag + var scriptIndex = data.html.indexOf("