From 4a2c0fcc36695c70c70a83ac04a8cb25f28b02d2 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 26 Jan 2011 16:17:28 +0100 Subject: Add 'jot_tool' hook, plugins can add tool icons. --- addon/README | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addon') diff --git a/addon/README b/addon/README index 2e4ed6029..fb1c6340a 100644 --- a/addon/README +++ b/addon/README @@ -156,7 +156,8 @@ Current hooks: 'page_end' - called after HTML content functions have completed $b is (string) HTML of content div - +'jot_plugin' - add tools to jot toolbar + $b is (string) HTML for tool icon *** = subject to change -- cgit v1.2.3 From 62fda0a120fe4d068f1380924b5493adb70064ea Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 26 Jan 2011 16:20:12 +0100 Subject: oembed consumer plugin --- addon/oembed/oembed.js | 51 +++++++++++++++++++++++++++++++++++++++++++ addon/oembed/oembed.php | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ addon/oembed/oembed.png | Bin 0 -> 417 bytes 3 files changed, 107 insertions(+) create mode 100644 addon/oembed/oembed.js create mode 100644 addon/oembed/oembed.php create mode 100644 addon/oembed/oembed.png (limited to 'addon') diff --git a/addon/oembed/oembed.js b/addon/oembed/oembed.js new file mode 100644 index 000000000..26541490b --- /dev/null +++ b/addon/oembed/oembed.js @@ -0,0 +1,51 @@ +function oembed(){ + $("#oembed").toggleClass('hide'); +} + +function oembed_do(){ + embedurl = $('#oembed_url').attr('value'); + var url = 'http://oohembed.com/oohembed/?url='+escape( embedurl )+"&callback=?"; + + $.getJSON(url, function(data) { + var ret=""; + switch(data.type){ + case "video": { + if (data.thumbnail_url){ + tw = 200; if (data.thumbnail_width) tw=data.thumbnail_width; + th = 180; if (data.thumbnail_height) tw=data.thumbnail_height; + ret = ""; + // tiny mce bbcode plugin not support image size...... + ret += ""; + } else { + ret = data.html; + } + }; break; + case "photo": { + // tiny mce bbcode plugin not support image size...... + ret = ""; + }; break; + case "link": { + ret = ""+data.title+""; + }; break; + case "rich": { + ret = data.html; // not so safe... http://www.oembed.com/ : "Consumers may wish to load the HTML in an off-domain iframe to avoid XSS" + }; break; + default: { + alert("Error retriving data!"); + return; + } + } + var embedlink = embedurl; + if (data.title) embedlink = data.title + ret+="
"+embedlink+""; + if (data.author_name) { + ret+=" by "+data.author_name; + } + if (data.provider_name) { + ret+=" on "+data.provider_name; + } + tinyMCE.execCommand('mceInsertRawHTML',false,ret); + oembed(); + }); + +} diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php new file mode 100644 index 000000000..55654a543 --- /dev/null +++ b/addon/oembed/oembed.php @@ -0,0 +1,56 @@ + + '; + + $b .= ' +
  + + +

Paste a link from 5min.com, Amazon Product Image, blip.tv, Clikthrough, CollegeHumor Video, + Daily Show with Jon Stewart, Dailymotion, dotSUB.com, Flickr Photos, Funny or Die Video, + Google Video, Hulu, Kinomap, LiveJournal UserPic, Metacafe, National Film Board of Canada, + Phodroid Photos, Photobucket, Qik Video, Revision3, Scribd, SlideShare, TwitPic, Twitter Status, + Viddler Video, Vimeo, Wikipedia, Wordpress.com, XKCD Comic, YFrog, YouTube

+
+ '; +} + + +function oembed_hook_jot_tool($a, &$b) { + $b .= ' +
+ Embed +
+ '; +} + + + +?> \ No newline at end of file diff --git a/addon/oembed/oembed.png b/addon/oembed/oembed.png new file mode 100644 index 000000000..6fc3794bb Binary files /dev/null and b/addon/oembed/oembed.png differ -- cgit v1.2.3 From 43be72297a281b41e7b77ba6078aeb48ee007299 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 26 Jan 2011 17:17:02 +0100 Subject: Rewrite oembed plugin to use new bbcode tag [embed] and make discovery server-side --- addon/oembed/oembed.js | 47 +++-------------------------------------------- addon/oembed/oembed.php | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 44 deletions(-) (limited to 'addon') diff --git a/addon/oembed/oembed.js b/addon/oembed/oembed.js index 26541490b..54547a86e 100644 --- a/addon/oembed/oembed.js +++ b/addon/oembed/oembed.js @@ -3,49 +3,8 @@ function oembed(){ } function oembed_do(){ - embedurl = $('#oembed_url').attr('value'); - var url = 'http://oohembed.com/oohembed/?url='+escape( embedurl )+"&callback=?"; - - $.getJSON(url, function(data) { - var ret=""; - switch(data.type){ - case "video": { - if (data.thumbnail_url){ - tw = 200; if (data.thumbnail_width) tw=data.thumbnail_width; - th = 180; if (data.thumbnail_height) tw=data.thumbnail_height; - ret = ""; - // tiny mce bbcode plugin not support image size...... - ret += ""; - } else { - ret = data.html; - } - }; break; - case "photo": { - // tiny mce bbcode plugin not support image size...... - ret = ""; - }; break; - case "link": { - ret = ""+data.title+""; - }; break; - case "rich": { - ret = data.html; // not so safe... http://www.oembed.com/ : "Consumers may wish to load the HTML in an off-domain iframe to avoid XSS" - }; break; - default: { - alert("Error retriving data!"); - return; - } - } - var embedlink = embedurl; - if (data.title) embedlink = data.title - ret+="
"+embedlink+""; - if (data.author_name) { - ret+=" by "+data.author_name; - } - if (data.provider_name) { - ret+=" on "+data.provider_name; - } - tinyMCE.execCommand('mceInsertRawHTML',false,ret); - oembed(); - }); + embed = "[embed]"+$('#oembed_url').attr('value')+"[/embed]"; + tinyMCE.execCommand('mceInsertRawHTML',false,embed); + oembed(); } diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php index 55654a543..82183f3cc 100644 --- a/addon/oembed/oembed.php +++ b/addon/oembed/oembed.php @@ -10,11 +10,13 @@ function oembed_install() { register_hook('jot_tool', 'addon/oembed/oembed.php', 'oembed_hook_jot_tool'); register_hook('page_header', 'addon/oembed/oembed.php', 'oembed_hook_page_header'); + register_hook('bbcode', 'addon/oembed/oembed.php', 'oembed_hook_bbcode'); } function oembed_uninstall() { unregister_hook('jot_tool', 'addon/oembed/oembed.php', 'oembed_hook_jot_tool'); unregister_hook('page_header', 'addon/oembed/oembed.php', 'oembed_hook_page_header'); + unregister_hook('bbcode', 'addon/oembed/oembed.php', 'oembed_hook_bbcode'); } function oembed_hook_page_header($a, &$b){ @@ -51,6 +53,49 @@ function oembed_hook_jot_tool($a, &$b) { '; } +function oembed_replacecb($matches){ + $embedurl=$matches[1]; + $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl); + $txt = fetch_url($ourl); + $j = json_decode($txt); + $ret=""; + switch ($j->type) { + case "video": { + if (isset($j->thumbnail_url)) { + $tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200; + $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180; + $ret = ""; + $ret.= ""; + $ret.= ""; + } else { + $ret=$j->html; + } + $ret.="
"; + }; break; + case "photo": { + $ret = ""; + $ret.="
"; + }; break; + case "link": { + //$ret = "".$j->title.""; + }; break; + case "rich": { + // not so safe.. + $ret = "
".$j->html."
"; + }; break; + } + + $embedlink = (isset($j->title))?$j->title:$embedurl; + $ret .= "$embedlink"; + if (isset($j->author_name)) $ret.=" by ".$j->author_name; + if (isset($j->provider_name)) $ret.=" on ".$j->provider_name; + $ret.=""; + return $ret; +} + +function oembed_hook_bbcode($a, &$text){ + $text = preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", oembed_replacecb ,$text); +} ?> \ No newline at end of file -- cgit v1.2.3