[pLog-svn] r6937 - in plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo: . css images
jondaley at devel.lifetype.net
jondaley at devel.lifetype.net
Tue Dec 29 10:19:41 EST 2009
Author: jondaley
Date: 2009-12-29 10:19:41 -0500 (Tue, 29 Dec 2009)
New Revision: 6937
Added:
plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/images/vimeo.png
Modified:
plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/css/content.css
plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/editor_plugin.js
plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/functions.js
plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/videoinput.html
Log:
added vimeo
Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/css/content.css
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/css/content.css 2009-12-24 18:05:23 UTC (rev 6936)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/css/content.css 2009-12-29 15:19:41 UTC (rev 6937)
@@ -5,6 +5,13 @@
background-repeat: no-repeat;
background-color: #ffffcc;
}
+.ltVideoVimeo {
+ border: 1px dotted #cc0000;
+ background-image: url('../images/vimeo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ background-color: #ffffcc;
+}
.ltVideoGoogleVideo {
border: 1px dotted #cc0000;
background-image: url('../images/gvideo.png');
@@ -46,4 +53,4 @@
background-position: center;
background-repeat: no-repeat;
background-color: #ffffcc;
- }
\ No newline at end of file
+ }
Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/editor_plugin.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/editor_plugin.js 2009-12-24 18:05:23 UTC (rev 6936)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/editor_plugin.js 2009-12-29 15:19:41 UTC (rev 6937)
@@ -49,7 +49,7 @@
insertvideo['file'] = '../../plugins/insertvideo/videoinput.html'; // Relative to theme
insertvideo['width'] = 500;
- insertvideo['height'] = 260;
+ insertvideo['height'] = 290;
tinyMCE.openWindow(insertvideo, {editor_id : editor_id, resizable : "no", scrollbars : "no", inline : "yes"});
}
@@ -67,7 +67,6 @@
if (tinyMCE.getParam('convert_urls')) {
var imgs = content.getElementsByTagName("img");
for (var i=0; i<imgs.length; i++) {
- //if (tinyMCE.getAttrib(imgs[i], "class")== "ltVideoYouTube") {
if (tinyMCE.getAttrib(imgs[i], "class").substr(0,6) == "ltVideo") {
var src = tinyMCE.getAttrib(imgs[i], "alt");
@@ -143,6 +142,9 @@
else if( videoType == 7 ) {
cssClass = "ltVideoDailymot";
}
+ else if( videoType == 8 ) {
+ cssClass = "ltVideoVimeo";
+ }
else {
// ignore it, it's not a youtube or googlevideo video
startPos++;
@@ -174,7 +176,7 @@
var attribs = TinyMCE_insertvideoPlugin._parseAttributes(content.substring(startPos + 4, endPos));
// Is not flash, skip it
- if (attribs['class'] != "ltVideoYouTube" && attribs['class'] != "ltVideoGoogleVideo" && attribs['class'] != "ltVideoMetacafe" && attribs['class'] != "ltVideoIfilm" && attribs['class'] != "ltVideoGoear" && attribs['class'] != "ltVideoGrouper" && attribs['class'] != "ltVideoDailymot")
+ if (attribs['class'] != "ltVideoYouTube" && attribs['class'] != "ltVideoGoogleVideo" && attribs['class'] != "ltVideoMetacafe" && attribs['class'] != "ltVideoIfilm" && attribs['class'] != "ltVideoGoear" && attribs['class'] != "ltVideoGrouper" && attribs['class'] != "ltVideoDailymot" && attribs['class'] != "ltVideoVimeo")
continue;
type = attribs['class'];
@@ -298,7 +300,8 @@
4: /^http:\/\/www\.ifilm\.com\//,
5: /^http:\/\/www\.goear.com\//,
6: /^http:\/\/www\.grouper\.com\//,
- 7: /^http:\/\/www\.dailymotion\.com\//
+ 7: /^http:\/\/www\.dailymotion\.com\//,
+ 8: /^http:\/\/vimeo\.com\//
};
var found = false;
Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/functions.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/functions.js 2009-12-24 18:05:23 UTC (rev 6936)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/functions.js 2009-12-29 15:19:41 UTC (rev 6937)
@@ -8,6 +8,18 @@
return regexp.test(url);
}
+function getVimeoLink( url )
+{
+ var regexp = /http:\/\/vimeo.com\/([0-9]+)/i;
+ result = regexp.exec( url );
+ if(!result){
+ return url;
+ }
+ videoId = result[1];
+ url = "http://vimeo.com/moogaloop.swf?clip_id="+videoId+"&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=0a7ac2&fullscreen=1";
+ return url;
+}
+
function getYouTubeLink( url )
{
// check if this is a URL pointing to a youtube link or to a youtube video
@@ -171,6 +183,7 @@
}
// check if a destination system was selected
+ vimeo = document.getElementById("vimeo");
youtube = document.getElementById("youtube");
gvideo = document.getElementById("gvideo");
// dalealplay = document.getElementById("dalealplay");
@@ -181,11 +194,17 @@
dailymot = document.getElementById("dailymot");
// bolt = document.getElementById("bolt");
- if( youtube.checked==false && gvideo.checked==false && metacafe.checked==false && ifilm.checked==false && goear.checked==false && grouper.checked==false && dailymot.checked==false ) {
+ if( vimeo.checked==false && youtube.checked==false && gvideo.checked==false && metacafe.checked==false && ifilm.checked==false && goear.checked==false && grouper.checked==false && dailymot.checked==false ) {
window.alert( tinyMCE.getLang('lang_insertvideo_selectiontype', 0) );
return( false );
}
+ if( vimeo.checked == true ) {
+ link = getVimeoLink( url );
+ css="ltVideoVimeo";
+ width=425;
+ height=355;
+ }
if( youtube.checked == true ) {
link = getYouTubeLink( url );
css="ltVideoYouTube";
Added: plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/images/vimeo.png
===================================================================
(Binary files differ)
Property changes on: plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/images/vimeo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/videoinput.html
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/videoinput.html 2009-12-24 18:05:23 UTC (rev 6936)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/videoinput.html 2009-12-29 15:19:41 UTC (rev 6937)
@@ -14,7 +14,7 @@
</div>
<div class="panel_wrapper">
<div id="general_panel" class="panel_current">
- <legend>{$lang_insertvideo_linklegend}</legend>
+ <legend>{$lang_insertvideo_linklegend}</legend>
<table border="0" cellpadding="4" cellspacing="0">
<tr>
<td nowrap="nowrap">{$lang_insertvideo_link}</td>
@@ -30,6 +30,7 @@
<input type="radio" id="goear" style="border:0px"name="type" value="5"><img src="images/goear.png" alt="Goear" /> Goear<br />
<input type="radio" id="grouper" style="border:0px"name="type" value="6"><img src="images/grouper.png" alt="Grouper" /> Grouper<br />
<input type="radio" id="dailymot" style="border:0px"name="type" value="7"><img src="images/dailymotion.png" alt="dailymotion" /> dailymotion <span style="color: grey; font-style: oblique;">({$lang_insertvideo_dailymotembeddableplayer})</span><br />
+ <input type="radio" id="vimeo" style="border:0px" name="type" value="8"><img src="images/vimeo.png" alt="Vimeo" /> Vimeo<br />
</td>
</tr>
</table>
More information about the pLog-svn
mailing list