[pLog-svn] r7045 - in plog/branches/lifetype-1.2/js/tinymce: . plugins/insertaudio plugins/insertaudio/img

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2010-09-22 16:50:00 -0400 (Wed, 22 Sep 2010)
New Revision: 7045

Added:
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/editor_plugin.js
   plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/img/spacer.gif
Modified:
   plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog-resourcelist.js
   plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog.js
Log:
I think the insertaudio plugin is now working, but it depends on the insertresource plugin

Added: plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/editor_plugin.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/editor_plugin.js	                        (rev 0)
+++ plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/editor_plugin.js	2010-09-22 20:50:00 UTC (rev 7045)
@@ -0,0 +1 @@
+(function(){tinymce.PluginManager.requireLangPack('insertaudio');tinymce.create('tinymce.plugins.InsertAudioPlugin',{init:function(ed,url){ed.addCommand('mceInsertAudio',function(){ed.windowManager.open({file:url+'/dialog.htm',width:500+parseInt(ed.getLang('InsertAudio.delta_width',0)),height:120+parseInt(ed.getLang('InsertAudio.delta_height',0)),inline:1},{plugin_url:url,})});ed.addButton('insertaudio',{title:'insertaudio.desc',cmd:'mceInsertAudio',image:url+'/img/insertaudio.gif'});ed.onNodeChange.add(function(ed,cm,n){cm.setActive('insertaudio',n.nodeName=='IMG')})},createControl:function(n,cm){return null},getInfo:function(){return{longname:'InsertAudio plugin',author:'LifeType',authorurl:'http://lifetype.net',infourl:'',version:"1.0"}}});tinymce.PluginManager.add('insertaudio',tinymce.plugins.InsertAudioPlugin)})();
\ No newline at end of file

Added: plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/img/spacer.gif
===================================================================
(Binary files differ)


Property changes on: plog/branches/lifetype-1.2/js/tinymce/plugins/insertaudio/img/spacer.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog-resourcelist.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog-resourcelist.js	2010-09-22 19:07:42 UTC (rev 7044)
+++ plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog-resourcelist.js	2010-09-22 20:50:00 UTC (rev 7045)
@@ -88,13 +88,10 @@
 {
     url = url.replace(/ /g, '%20');
 	if( tinyMCEEnabled ) {
-		var htmlCode = '<img src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" mce_src="' + (tinyMCE.getParam("theme_href") + "/images/spacer.gif") + '" ' + 'width="' + width + '" height="' + height + '" ' + 'border="0" alt="' + url + '" title="' + url + '" class="ltFlashPlayer" />';
+		var htmlCode = '<img src="' + (tinyMCEPopup.getWindowArg('plugin_url') + "/img/spacer.gif") + '" mce_src="' + (tinyMCEPopup.getWindowArg('plugin_url') + "/img/spacer.gif") + '" ' + 'width="' + width + '" height="' + height + '" ' + 'border="0" alt="' + url + '" title="' + url + '" class="ltFlashPlayer" />';
 
-	   	tinyMCE.execCommand( "mceInsertContent", true, htmlCode );
-		tinyMCE.selectedInstance.repaint();	
-
-		// Close the dialog
-		tinyMCE.closeWindow(window);
+	   	tinyMCE.execCommand( "mceInsertContent", false, htmlCode );
+		tinyMCEPopup.close();
 	}
 	else {
 		addText( parent.opener.document.newPost.postText, getFlashPlayerHTML( url, height, width ));

Modified: plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog.js
===================================================================
--- plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog.js	2010-09-22 19:07:42 UTC (rev 7044)
+++ plog/branches/lifetype-1.2/js/tinymce/tiny_mce-plog.js	2010-09-22 20:50:00 UTC (rev 7045)
@@ -1,4 +1,4 @@
-tinymce_plugins="more,advhr,advimage,advlink,emotions,inlinepopups,insertdatetime,media,searchreplace,paste,fullscreen,nonbreaking,wordcount,advlist,autosave";
+tinymce_plugins="more,advhr,advimage,advlink,emotions,inlinepopups,insertdatetime,media,searchreplace,paste,fullscreen,nonbreaking,wordcount,advlist,autosave,insertaudio";
 
 tinyMCE_GZ.init({
             // user-defined plugins and themes should be identical to those in "tinyMCE.init" below.-->
@@ -16,7 +16,7 @@
             elements : "postText,postExtendedText",
             theme : "advanced",
             plugins : tinymce_plugins,
-            
+
                 // Theme options
             theme_advanced_buttons1: "formatselect,fontsizeselect,fontselect,forecolor,backcolor,bold,italic,underline,strikethrough,sub,sup,|,justifyleft,justifycenter,justifyright,justifyfull",
             theme_advanced_buttons2: "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,indent,outdent,blockquote,|,undo,redo,|,hr,advhr,charmap,insertdate,inserttime,nonbreaking,|,fullscreen",