X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=www%2Fjssrc%2Flib%2Fblergmedia.js;h=c53ec5cf846fa0abcc80504872671d1ca037c977;hb=HEAD;hp=cdd3e80d4f316d54271e0dbb591776bc6a80ab21;hpb=68c151f4dd2cd8acd97667353217ed1f2f2a4702;p=blerg.git
diff --git a/www/jssrc/lib/blergmedia.js b/www/jssrc/lib/blergmedia.js
index cdd3e80..c53ec5c 100644
--- a/www/jssrc/lib/blergmedia.js
+++ b/www/jssrc/lib/blergmedia.js
@@ -1,6 +1,7 @@
var BlergMedia = {
audioExtensions: [],
- videoExtensions: []
+ videoExtensions: [],
+ imageExtensions: ['jpg', 'jpeg', 'gif', 'png']
};
BlergMedia.media_init = function() {
@@ -41,11 +42,14 @@ BlergMedia.media_init = function() {
BlergMedia.videoTypeRegex = new RegExp("video:(" + BlergMedia.videoExtensions.join('|') + ")$");
BlergMedia.videoExtensionRegex = new RegExp("\\.(" + BlergMedia.videoExtensions.join('|') + ")$");
}
+
+ BlergMedia.imageTypeRegex = new RegExp("image:(" + BlergMedia.imageExtensions.join('|') + ")$");
+ BlergMedia.imageExtensionRegex = new RegExp("\\.(" + BlergMedia.imageExtensions.join('|') + ")$");
}
-BlergMedia.play_audio = function() {
- var e = event.target.parentElement;
- var url = event.target.parentElement.href;
+BlergMedia.play_audio = function(ev) {
+ var e = ev.target.parentElement;
+ var url = ev.target.parentElement.href;
var audio_element = document.createElement('audio');
audio_element.src = url;
audio_element.controls = 1;
@@ -53,9 +57,9 @@ BlergMedia.play_audio = function() {
e.parentElement.replaceChild(audio_element, e);
}
-BlergMedia.play_video = function() {
- var e = event.target.parentElement;
- var url = event.target.parentElement.href;
+BlergMedia.play_video = function(ev) {
+ var e = ev.target.parentElement;
+ var url = ev.target.parentElement.href;
var p = document.createElement('p');
var video_element = document.createElement('video');
video_element.src = url;
@@ -65,13 +69,29 @@ BlergMedia.play_video = function() {
e.parentElement.replaceChild(video_element, e);
}
+BlergMedia.show_image = function(ev) {
+ var img = ev.target;
+ var medialink = img.parentElement;
+ var url = medialink.href;
+ var anchor = medialink.previousElementSibling;
+ var title = anchor.firstChild.data;
+ img.src = url;
+ img.title = img.alt = title;
+ // Get rid of whitespace between anchor and medialink
+ medialink.parentElement.removeChild(medialink.previousSibling);
+ anchor.parentElement.removeChild(anchor);
+}
+
BlergMedia.process = function(data) {
- if (BlergMedia.audioExtensionRegex.test(data.url) ||
- (data.extra && BlergMedia.audioTypeRegex.test(data.extra))) {
- data.widget = '';
+ if (BlergMedia.imageExtensionRegex.test(data.url) ||
+ (data.extra && BlergMedia.imageExtensionRegex.test(data.extra))) {
+ data.widget = '';
+ } else if (BlergMedia.audioExtensionRegex.test(data.url) ||
+ (data.extra && BlergMedia.audioTypeRegex.test(data.extra))) {
+ data.widget = '';
} else if (BlergMedia.videoExtensionRegex.test(data.url) ||
(data.extra && BlergMedia.videoTypeRegex.test(data.extra))) {
- data.widget = '';
+ data.widget = '';
}
return data;