[pLog-svn] r7224 - in plog/branches/lifetype-1.2/js/tinymce/plugins: . insertyoutube insertyoutube/langs

jondaley at devel.lifetype.net jondaley at devel.lifetype.net
Tue Oct 23 03:10:01 EDT 2018


Author: jondaley
Date: 2018-10-23 03:10:01 -0400 (Tue, 23 Oct 2018)
New Revision: 7224

Added:
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/
Removed:
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/css/
Modified:
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/README.txt
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/editor_plugin.js
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/editor_plugin_src.js
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/functions.js
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/langs/en.js
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/langs/en_dlg.js
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/videoinput.html
Log:
new plugin for youtube videos, using <iframe>

Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/README.txt
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/README.txt	2015-12-18 03:59:59 UTC (rev 7222)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/README.txt	2018-10-23 07:10:01 UTC (rev 7224)
@@ -1,18 +1,9 @@
-InsertVideo:
+InsertYoutube:
 
-Author: Oscar Renalias / LifeType (copied from the flash plugin)
+Author: Jon Daley / LifeType (copied from the insertVideo plugin)
 
-A plugin for tinymce that allows to insert videos from youtube and
-google video without breaking the xhhtml compliancy. The code has been
-shamelessly ripped from the tinymce 'flash' plugin but it works.
+A plugin for tinymce that allows to insert videos from the
+new youtube iframe format without breaking the xhhtml compliancy.
 
-
-
 History:
-
-10/2006: Created
-
-early 2007: various bug fixes/typos
-
-06/2007: DailyMotion support and Localized for other
-         languages by Gabriel Rousseau
+ 10/2018: Created

Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/editor_plugin.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/editor_plugin.js	2015-12-18 03:59:59 UTC (rev 7222)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/editor_plugin.js	2018-10-23 07:10:01 UTC (rev 7224)
@@ -1,8 +1,6 @@
 
-(function(){tinymce.PluginManager.requireLangPack('insertvideo');tinymce.create('tinymce.plugins.InsertVideoPlugin',{init:function(ed,url){var t=this;t.ed=ed;t.url=url;ed.onBeforeSetContent.add(function(ed,o){o.content=t._insertToEditor(t,o.content);});ed.onPostProcess.add(function(ed,o){if(o.set){o.content=t._insertToEditor(t,o.content);}
-if(o.get){o.content=t._getFromEditor(t,o.content);}});ed.addCommand('mceInsertVideo',function(){ed.windowManager.open({file:url+'/videoinput.html',width:500,height:300,inline:1},{plugin_url:url});});ed.addButton('insertvideo',{title:'insertvideo.desc',cmd:'mceInsertVideo',image:url+'/img/youtube.png'});ed.onInit.add(function(){if(ed.settings.content_css!==false)
-ed.dom.loadCSS(url+"/css/content.css");});},getInfo:function(){return{longname:'Insert Video',author:'LifeType Team',authorurl:'http://www.lifetype.net',infourl:'http://www.lifetype.net',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_insertToEditor:function(t,content){cdom=tinymce.DOM.create('div');tinymce.DOM.setHTML(cdom,content);elems=tinymce.DOM.select('object[data]',cdom);tinymce.each(elems,function(e){src=e.data;cls=t._getVideoType(src);if(src&&cls){height=e.height;width=e.width;imgHTML=t._getVideoImgHTML(src,height,width,cls);tinymce.DOM.setOuterHTML(e,imgHTML);}});content=cdom.innerHTML;tinymce.DOM.remove(cdom);return content;},_getFromEditor:function(t,content){cdom=tinymce.DOM.create('div');tinymce.DOM.setHTML(cdom,content);elems=tinymce.DOM.select('img[class^=ltVideo]',cdom);tinymce.each(elems,function(e){cls=t._isValidVideoType(e.className);src=e.alt;if(src&&cls){height=e.height;width=e.width;embedHTML=t._getVideoFlashHTML(src,height,width,cls);tinymce.DOM.set
 OuterHTML(e,embedHTML);}});content=cdom.innerHTML;tinymce.DOM.remove(cdom);return content;},_getVideoType:function(url)
-{var sites={GoogleVideo:{regexp:/^http:\/\/video\.google\.com\//,cls:'ltVideoGoogleVideo'},YouTube:{regexp:/^http:\/\/.{2,3}\.youtube\.com\//,cls:'ltVideoYouTube'},Metacafe:{regexp:/^http:\/\/www\.metacafe\.com\//,cls:'ltVideoMetacafe'},Ifilm:{regexp:/^http:\/\/www\.ifilm\.com\//,cls:'ltVideoIfilm'},VideoGoear:{regexp:/^http:\/\/www\.goear.com\//,cls:'ltVideoGoear'},Grouper:{regexp:/^http:\/\/www\.grouper\.com\//,cls:'ltVideoGrouper'},DailyMotion:{regexp:/^http:\/\/www\.dailymotion\.com\//,cls:'ltVideoDailymot'},Vimeo:{regexp:/^http:\/\/vimeo\.com\//,cls:'ltVideoVimeo'}};var cls='';for(site in sites){if(url.match(sites[site].regexp)){cls=sites[site].cls;break;}}
-return(cls);},_isValidVideoType:function(cls){result=cls.match(/^ltVideo(GoogleVideo|YouTube|Metacafe|Ifilm|Goear|Grouper|Dailymot|Vimeo)/);return(result?'ltVideo'+result[1]:false);},_getVideoImgHTML:function(src,height,width,cls){html='<img width="'+width+'" height="'+height+'"'+' src="'+this.url+'/img/spacer.gif'+'" title="'+src+'"'+' alt="'+src+'" class="'+cls+'" />';return html;},_getVideoFlashHTML:function(url,height,width,cls)
-{html='<object type="application/x-shockwave-flash" width="'+width+'" height="'+height+'" data="'+url+'" class="'+cls+'">'+'<param name="movie" value="'+url+'" />'+'<param name="wmode" value="transparent" />'+'<param name="allowScriptAccess" value="sameDomain" />'+'<param name="quality" value="best" />'+'<param name="bgcolor" value="#ffffff" />';if(cls=='ltVideoGoear'){html+='<param name="FlashVars" value="'+url.substring(43,url.length)+'" />';}else{html+='<param name="FlashVars" value="playerMode=embedded" />';}
-html+='</object>';return html;}});tinymce.PluginManager.add('insertvideo',tinymce.plugins.InsertVideoPlugin);})();
\ No newline at end of file
+(function(){tinymce.PluginManager.requireLangPack('insertyoutube');tinymce.create('tinymce.plugins.InsertYoutubePlugin',{init:function(ed,url){var t=this;t.ed=ed;t.url=url;ed.onBeforeSetContent.add(function(ed,o){o.content=t._insertToEditor(t,o.content);});ed.onPostProcess.add(function(ed,o){if(o.set){o.content=t._insertToEditor(t,o.content);}
+if(o.get){o.content=t._getFromEditor(t,o.content);}});ed.addCommand('mceInsertYoutube',function(){ed.windowManager.open({file:url+'/videoinput.html',width:500,height:300,inline:1},{plugin_url:url});});ed.addButton('insertyoutube',{title:'insertyoutube.desc',cmd:'mceInsertYoutube',image:url+'/img/youtube.png'});},getInfo:function(){return{longname:'Insert Video',author:'LifeType Team',authorurl:'http://www.lifetype.net',infourl:'http://www.lifetype.net',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_insertToEditor:function(t,content){cdom=tinymce.DOM.create('div');tinymce.DOM.setHTML(cdom,content);elems=tinymce.DOM.select('iframe',cdom);tinymce.each(elems,function(e){src=e.src;cls=t._getVideoType(src);if(src&&cls){height=e.height;width=e.width;imgHTML=t._getVideoImgHTML(src,height,width,cls);tinymce.DOM.setOuterHTML(e,imgHTML);}});content=cdom.innerHTML;tinymce.DOM.remove(cdom);return content;},_getFromEditor:function(t,content){cdom=tinymce.DOM.create('div');tinymce.DOM.s
 etHTML(cdom,content);elems=tinymce.DOM.select('img[class^=ltYoutube]',cdom);tinymce.each(elems,function(e){cls=t._isValidVideoType(e.className);src=e.alt;if(src&&cls){height=e.height;width=e.width;embedHTML=t._getVideoFlashHTML(src,height,width,cls);tinymce.DOM.setOuterHTML(e,embedHTML);}});content=cdom.innerHTML;tinymce.DOM.remove(cdom);return content;},_getVideoType:function(url)
+{var sites={YouTube:{regexp:/^http:\/\/.{2,3}\.youtube\.com\//,cls:'ltYoutube'},};var cls='';for(site in sites){if(url.match(sites[site].regexp)){cls=sites[site].cls;break;}}
+return(cls);},_isValidVideoType:function(cls){return(cls=='ltYoutube');},_getVideoImgHTML:function(src,height,width,cls){html='<img width="'+width+'" height="'+height+'"'+' src="'+this.url+'/img/spacer.gif'+'" title="'+src+'"'+' alt="'+src+'" class="'+cls+'" />';return html;},_getVideoFlashHTML:function(url,height,width,cls)
+{html='<iframe class="'+cls+'" width="'+width+'" height="'+height+'" src="'+url+'" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>';return html;}});tinymce.PluginManager.add('insertyoutube',tinymce.plugins.InsertYoutubePlugin);})();
\ No newline at end of file

Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/editor_plugin_src.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/editor_plugin_src.js	2015-12-18 03:59:59 UTC (rev 7222)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/editor_plugin_src.js	2018-10-23 07:10:01 UTC (rev 7224)
@@ -6,8 +6,8 @@
  */
 
 (function() {
-    tinymce.PluginManager.requireLangPack('insertvideo');
-    tinymce.create('tinymce.plugins.InsertVideoPlugin', {
+    tinymce.PluginManager.requireLangPack('insertyoutube');
+    tinymce.create('tinymce.plugins.InsertYoutubePlugin', {
         init : function(ed, url) {
             var t = this;
                 t.ed = ed;
@@ -26,7 +26,7 @@
                 }
             });
 
-            ed.addCommand('mceInsertVideo', function() {
+            ed.addCommand('mceInsertYoutube', function() {
                 ed.windowManager.open({
                     file : url + '/videoinput.html',
                     width : 500,
@@ -38,16 +38,11 @@
             });
 
             // Register insertresource button
-            ed.addButton('insertvideo', {
-                title : 'insertvideo.desc',
-                cmd : 'mceInsertVideo',
+            ed.addButton('insertyoutube', {
+                title : 'insertyoutube.desc',
+                cmd : 'mceInsertYoutube',
                 image : url + '/img/youtube.png'
             });
-
-            ed.onInit.add(function() {
-                if (ed.settings.content_css !== false)
-                    ed.dom.loadCSS(url + "/css/content.css");
-            });
         },
 
         getInfo : function() {
@@ -64,10 +59,10 @@
             // Parse all object tags and replace them with img
             cdom = tinymce.DOM.create('div');
             tinymce.DOM.setHTML(cdom, content);
-            elems = tinymce.DOM.select('object[data]', cdom);
+            elems = tinymce.DOM.select('iframe', cdom);
 
             tinymce.each(elems, function(e) {
-                src = e.data;
+                src = e.src;
                 cls = t._getVideoType(src);
                 if (src && cls) {
                     height = e.height;
@@ -87,7 +82,7 @@
             // Parse all img[class=ltVideo*] tags and replace them with object+embed
             cdom = tinymce.DOM.create('div');
             tinymce.DOM.setHTML(cdom, content);
-            elems = tinymce.DOM.select('img[class^=ltVideo]', cdom);
+            elems = tinymce.DOM.select('img[class^=ltYoutube]', cdom);
 
             tinymce.each(elems, function(e) {
                 cls = t._isValidVideoType(e.className);
@@ -109,14 +104,7 @@
         _getVideoType : function(url)
         {
           var sites = {
-                GoogleVideo : {regexp : /^http:\/\/video\.google\.com\//, cls : 'ltVideoGoogleVideo'},
-                YouTube     : {regexp : /^http:\/\/.{2,3}\.youtube\.com\//, cls : 'ltVideoYouTube'},
-                Metacafe    : {regexp : /^http:\/\/www\.metacafe\.com\//, cls : 'ltVideoMetacafe'},
-                Ifilm       : {regexp : /^http:\/\/www\.ifilm\.com\//, cls : 'ltVideoIfilm'},
-                VideoGoear  : {regexp : /^http:\/\/www\.goear.com\//, cls : 'ltVideoGoear'},
-                Grouper     : {regexp : /^http:\/\/www\.grouper\.com\//, cls : 'ltVideoGrouper'},
-                DailyMotion : {regexp : /^http:\/\/www\.dailymotion\.com\//, cls : 'ltVideoDailymot'},
-                Vimeo       : {regexp : /^http:\/\/vimeo\.com\//, cls : 'ltVideoVimeo'}
+                YouTube     : {regexp : /^http:\/\/.{2,3}\.youtube\.com\//, cls : 'ltYoutube'},
             };
 
             var cls = '';
@@ -131,9 +119,7 @@
         },
 
         _isValidVideoType: function(cls) {
-            result = cls.match(/^ltVideo(GoogleVideo|YouTube|Metacafe|Ifilm|Goear|Grouper|Dailymot|Vimeo)/);
-
-            return (result ? 'ltVideo'+result[1] : false);
+            return (cls == 'ltYoutube');
         },
 
         _getVideoImgHTML : function(src, height, width, cls) {
@@ -146,20 +132,8 @@
 
         _getVideoFlashHTML : function(url, height, width, cls)
         {
-            html = '<object type="application/x-shockwave-flash" width="' + width + '" height="' + height + '" data="' + url + '" class="' + cls + '">' +
-                   '<param name="movie" value="' + url + '" />' +
-                   '<param name="wmode" value="transparent" />' +
-                   '<param name="allowScriptAccess" value="sameDomain" />' +
-                   '<param name="quality" value="best" />' +
-                   '<param name="bgcolor" value="#ffffff" />';
-            if (cls == 'ltVideoGoear') {
-                html += '<param name="FlashVars" value="' + url.substring( 43, url.length ) + '" />';
-            } else {
-                html += '<param name="FlashVars" value="playerMode=embedded" />';
-            }
-
-            html += '</object>';
-
+            html = '<iframe class="'+cls+'" width="'+width+'" height="'+height+'" src="'+url+
+                '" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>';
             return html;
         }
 
@@ -166,5 +140,5 @@
     });
 
     // Register plugin
-    tinymce.PluginManager.add('insertvideo', tinymce.plugins.InsertVideoPlugin);
+    tinymce.PluginManager.add('insertyoutube', tinymce.plugins.InsertYoutubePlugin);
 })();

Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/functions.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/functions.js	2015-12-18 03:59:59 UTC (rev 7222)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/functions.js	2018-10-23 07:10:01 UTC (rev 7224)
@@ -9,252 +9,46 @@
     return regexp.test(url);
 }
 
-function getVimeoLink( url )
-{
-    var regexp = /http:\/\/(?:www\.)?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 )
 {
     var regexp;
     // check if this is a URL pointing to a youtube link or to a youtube video
-    //if( url.substring( 0, 31 ) == "http://www.youtube.com/watch?v=" ) {
-    if( url.match( /http:\/\/.{2,3}\.youtube.com\/.*?v=/i )) {
+    if( url.match( /https?:\/\/(.{2,3}\.)?youtube.com\/.*?v=/i )) {
         // and if it's a link to a normal youtube page, build the right link to the video player
-        regexp = /http:\/\/.{2,3}\.youtube.com\/.*?v=([\-0-9a-zA-z_]*).*/i;
-        result = regexp.exec( url );
-        if( result ) {
-            videoId = result[1];
+        regexp = /https?:\/\/(.{2,3}\.)?youtube.com\/.*?v=([\-0-9a-zA-z_]*).*/i;
+        result = regexp.exec(url);
+        if(result){
+            videoId = result[2];
+            url = "https://www.youtube.com/embed/" + videoId;
         }
-        else {
-            // let's try to make a best guess...
-            videoId = url.substring( 31, url.length );
-        }
-
-        url = "http://www.youtube.com/v/" + videoId;
     }
-    else if ( url.substring( 0, 27 ) == "http://youtube.com/watch?v=" ) {
-        // Checks if the URL is missing WWW.
-        // and if it's a link to a normal youtube page, build the right link to the video player
-        regexp = /http:\/\/youtube.com\/.*?v=([\-0-9a-zA-z_]*).*/i;
-        result = regexp.exec( url );
-        if( result ) {
-            videoId = result[1];
-        }
-        else {
-            // let's try to make a best guess...
-            videoId = url.substring( 27, url.length );
-        }
-
-        url = "http://www.youtube.com/v/" + videoId;
-    }
     else {
         regexp = /.*?v=([\-0-9a-zA-z_]*).*/i;
-        result = regexp.exec( url );
-        if( result ) {
+        result = regexp.exec(url);
+        if(result){
             videoId = result[1];
-            url = "http://www.youtube.com/v/" + videoId;
+            url = "https://www.youtube.com/embed/" + videoId;
         }
     }
-
-    return( url );
+    
+    return (url);
 }
 
-function getGoogleVideoLink( url )
+function insertYoutubeCode()
 {
-    // check if it's a link to a video page or a link to the video player
-    if( url.substring( 0, 40 ) == "http://video.google.com/videoplay?docid=" ) {
-        // if it's a link to a video page, generate the right one
-        var regexp = /http:\/\/video.google.com\/.*?docid=([\-0-9a-zA-z_]*).*/i;
-        result = regexp.exec( url );
-        if( result ) {
-            videoId = result[1];
-        }
-        else {
-            videoId = url.substring( 40, url.length );
-        }
-
-        url = "http://video.google.com/googleplayer.swf?docId=" + videoId;
-    }
-
-    return( url );
-}
-
-function getMetacafeVideoLink( url )
-{
-    // check if it's a link to a video page or a link to the video player
-    if( url.substring( 0, 30 ) == "http://www.metacafe.com/watch/" ) {
-        // if it's a link to a video page, generate the right one
-        var regexp = /http:\/\/www.metacafe.com\/watch\/.*?docid=([\-0-9a-zA-z_]*).*/i;
-        result = regexp.exec( url );
-        if( result ) {
-            videoId = result[1];
-        }
-        else {
-            videoId = url.substring( 30, url.length - 1 );
-        }
-
-        url = "http://www.metacafe.com/fplayer/" + videoId + ".swf";
-    }
-
-    return( url );
-}
-
-function getiFilmVideoLink( url )
-{
-    // check if it's a link to a video page or a link to the video player
-    if( url.substring( 0, 27 ) == "http://www.ifilm.com/video/" ) {
-        // if it's a link to a video page, generate the right one
-        var regexp = /http:\/\/www.ifilm.com\/video\/.*?docid=([\-0-9a-zA-z_]*).*/i;
-        result = regexp.exec( url );
-        if( result ) {
-            videoId = result[1];
-        }
-        else {
-            videoId = url.substring( 27, url.length );
-        }
-
-        url = "http://www.ifilm.com/efp?flvbaseclip=" + videoId ;
-    }
-
-    return( url );
-}
-
-function getGoearVideoLink( url )
-{
-    // check if it's a link to a video page or a link to the video player
-    if( url.substring( 0, 34 ) == "http://www.goear.com/listen.php?v=" ) {
-        // if it's a link to a video page, generate the right one
-        var regexp = /http:\/\/www.goear.com\/.*?v=([\-0-9a-zA-z_]*).*/i;
-        result = regexp.exec( url );
-        if( result ) {
-            videoId = result[1];
-        }
-        else {
-            videoId = url.substring( 34, url.length );
-        }
-        url = "http://www.goear.com/files/external.swf?file=" + videoId ;
-    }
-
-    return( url );
-}
-
-function getGrouperVideoLink( url )
-{
-    // check if it's a link to a video page or a link to the video player
-    if( url.substring( 0, 46 ) == "http://grouper.com/video/MediaDetails.aspx?id=" ) {
-        // if it's a link to a video page, generate the right one
-        var regexp = /http:\/\/www.grouper.com\/video\/MediaDetails.aspx.*?id=([\-0-9a-zA-z_]*).*/i;
-        result = regexp.exec( url );
-        if( result ) {
-            videoId = result[1];
-        }
-        else {
-            videoId = url.substring( 46, url.length );
-        }
-
-        url = "http://grouper.com/mtg/mtgPlayer.swf?gvars=vurl~http%3a%2f%2fgrouper.com%2frss%2fflv.ashx%3fid%3d" + videoId + "_rf%7e-9_vfver~8_ap~1_extid~-1";
-    }
-
-    return( url );
-}
-
-function getDailymotionLink( url )
-{
-    // check if this is a URL pointing to a dailymotion embedded video link
-    var regexp = /object\swidth="([0-9]+)"\sheight="([0-9]+)".+value="(http:\/\/www\.dailymotion\.com\/swf\/\w+).*"/;
-    result = regexp.exec( url );
-    return( result );
-}
-
-function insertVideoCode()
-{
     // get and check the URL
     urlField = document.forms[0].url;
     url = urlField.value;
     if( url === "" || !isValidUrl( url )) {
-        window.alert( tinyMCEPopup.getLang('insertvideo_dlg.badurl', 0) );
+        window.alert( tinyMCEPopup.getLang('insertyoutube_dlg.badurl', 0) );
         return( false );
     }
 
-    // check if a destination system was selected
-    vimeo = document.getElementById("vimeo");
-    youtube = document.getElementById("youtube");
-    gvideo = document.getElementById("gvideo");
-    metacafe = document.getElementById("metacafe");
-    ifilm = document.getElementById("ifilm");
-    goear = document.getElementById("goear");
-    grouper = document.getElementById("grouper");
-    dailymot = document.getElementById("dailymot");
+    link = getYouTubeLink( url );
+    css="ltYoutube";
+    width=425;
+    height=355;
 
-    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( tinyMCEPopup.getLang('insertvideo_dlg.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";
-        width=425;
-        height=355;
-    }
-    if( gvideo.checked === true ) {
-        link = getGoogleVideoLink( url );
-        css="ltVideoGoogleVideo";
-        width=425;
-        height=355;
-    }
-    if( metacafe.checked === true ) {
-        link = getMetacafeVideoLink( url );
-        css="ltVideoMetacafe";
-        width=400;
-        height=345;
-    }
-    if( ifilm.checked === true ) {
-        link = getiFilmVideoLink( url );
-        css="ltVideoIfilm";
-        width=448;
-        height=365;
-    }
-    if( goear.checked === true ) {
-        link = getGoearVideoLink( url );
-        css="ltVideoGoear";
-        width=366;
-        height=75;
-    }
-    if( grouper.checked === true ) {
-        link = getGrouperVideoLink( url );
-        css="ltVideoGrouper";
-        width=496;
-        height=398;
-    }
-    if( dailymot.checked === true ) {
-        result = getDailymotionLink( url );
-        width = result[1];
-        height = result[2];
-        link = result[3];
-        css="ltVideoDailymot";
-    }
     insertFlash( link, css, width, height );
 
     return true;

Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/langs/en.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/langs/en.js	2015-12-18 03:59:59 UTC (rev 7222)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/langs/en.js	2018-10-23 07:10:01 UTC (rev 7224)
@@ -1,3 +1,3 @@
-tinyMCE.addI18n('en.insertvideo',{
-	desc : 'Insert Video'
+tinyMCE.addI18n('en.insertyoutube',{
+	desc : 'Insert Youtube'
 });

Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/langs/en_dlg.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/langs/en_dlg.js	2015-12-18 03:59:59 UTC (rev 7222)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/langs/en_dlg.js	2018-10-23 07:10:01 UTC (rev 7224)
@@ -1,5 +1,5 @@
-tinyMCE.addI18n('en.insertvideo_dlg',{
-    desc : 'Insert Video',
+tinyMCE.addI18n('en.insertyoutube_dlg',{
+    desc : 'Insert Youtube',
     linklegend : 'Please provide a link to a video file.',
     link : 'Video URL:',
     selsource : 'Select Source:',

Modified: plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/videoinput.html
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertvideo/videoinput.html	2015-12-18 03:59:59 UTC (rev 7222)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertyoutube/videoinput.html	2018-10-23 07:10:01 UTC (rev 7224)
@@ -1,6 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <title>{#insertvideo_dlg.desc}</title>
+    <title>{#insertyoutube_dlg.desc}</title>
     <script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
     <script language="javascript" type="text/javascript" src="functions.js"></script>
     <script type="text/javascript">
@@ -12,36 +12,23 @@
     <form name="video" id="video" method="post" action="#">
         <div class="tabs">
             <ul>
-                <li id="general_tab" class="current"><span>{#insertvideo_dlg.desc}</span></li>
+                <li id="general_tab" class="current"><span>{#insertyoutube_dlg.desc}</span></li>
             </ul>
         </div>
         <div class="panel_wrapper">
             <div id="general_panel" class="panel_current">
-                <legend>{#insertvideo_dlg.linklegend}</legend>
+                <legend>{#insertyoutube_dlg.linklegend}</legend>
                 <table border="0" cellpadding="4" cellspacing="0">
                     <tr>
-                        <td nowrap="nowrap">{#insertvideo_dlg.link}</td>
-                        <td><input type="text" id="url" name="url" value="" {#insertvideo_dlg.inputurlstyle} /></td>
+                        <td nowrap="nowrap">{#insertyoutube_dlg.link}</td>
+                        <td><input type="text" id="url" name="url" value="" {#insertyoutube_dlg.inputurlstyle} /></td>
                     </tr>
-                    <tr>
-                        <td nowrap="nowrap">{#insertvideo_dlg.selsource}</td>
-                        <td>
-                            <input type="radio" id="youtube" style="border:0px" name="type" value="1"><img src="img/youtube.png" alt="YouTube" /> YouTube<br />
-                            <input type="radio" id="gvideo" style="border:0px"name="type" value="2"><img src="img/gvideo.png" alt="Google Video" /> Google Video<br />
-                            <input type="radio" id="metacafe" style="border:0px"name="type" value="3"><img src="img/metacafe.png" alt="Metacafe" /> Metacafe<br />
-                            <input type="radio" id="ifilm" style="border:0px"name="type" value="4"><img src="img/ifilm.png" alt="iFilm" /> iFilm<br />
-                            <input type="radio" id="goear" style="border:0px"name="type" value="5"><img src="img/goear.png" alt="Goear" /> Goear<br />
-                            <input type="radio" id="grouper" style="border:0px"name="type" value="6"><img src="img/grouper.png" alt="Grouper" /> Grouper<br />
-                            <input type="radio" id="dailymot" style="border:0px"name="type" value="7"><img src="img/dailymotion.png" alt="dailymotion" /> dailymotion <span style="color: grey; font-style: oblique;">({#insertvideo_dlg.dailymotembeddableplayer})</span><br />
-                            <input type="radio" id="vimeo" style="border:0px" name="type" value="8"><img src="img/vimeo.png" alt="Vimeo" /> Vimeo<br />
-                        </td>
-                    </tr>
                 </table>
             </div>
         </div>
         <div class="mceActionPanel">
             <div style="float:left">
-                <input type="button" name="insert" value="{#insert}" onClick="insertVideoCode()" id="insert" />
+                <input type="button" name="insert" value="{#insert}" onClick="insertYoutubeCode()" id="insert" />
             </div>
             <div style="float:right">
                 <input type="button" name="cancel" value="{#close}" onclick="tinyMCEPopup.close();" id="cancel" />



More information about the pLog-svn mailing list