--- editor_plugin.js.old	Sun Apr 06 18:43:20 2008
+++ editor_plugin.js	Fri Jun 06 14:00:43 2008
@@ -1,8 +1,11 @@
 /* Import plugin specific language pack */
-tinyMCE.importPluginLanguagePack('drupalimage', 'en');
+//tinyMCE.importPluginLanguagePack('drupalimage', 'en');
+tinymce.PluginManager.requireLangPack('drupalimage');
+
+//var TinyMCE_DrupalImagePlugin = {
+(function() {tinymce.create('tinymce.plugins.DrupalImagePlugin', {
 
-var TinyMCE_DrupalImagePlugin = {
 	getInfo : function() {
 		return {
 			longname : 'DrupalImage',
@@ -18,7 +21,7 @@ var TinyMCE_DrupalImagePlugin = {
 			tinyMCE.importCSS(inst.getDoc(), tinyMCE.baseURL + '/plugins/drupalimage/drupalimage.css');
 	},
 
-	getControlHTML : function(cn) {
+/*	getControlHTML : function(cn) {
 		switch (cn) {
 			case 'drupalimage':
 				return tinyMCE.getButtonHTML(cn, 'lang_drupalimage_desc', '{$pluginurl}/images/drupalimage.gif', 'mceDrupalImage');
@@ -75,7 +78,26 @@ var TinyMCE_DrupalImagePlugin = {
 	   }
 
 	   // Pass to next handler in chain
-	   return false;
+	   return false;*/
+	  init : function(ed, url) {
+		// Register commands
+		ed.addCommand('mceDrupalImage', function() {
+			ed.windowManager.open({
+				file : url + 'index.php?q=img_assist/load/tinymce',
+				width : 600 + parseInt(ed.getLang('advhr.delta_width', 0)),
+				height : 350 + parseInt(ed.getLang('advhr.delta_height', 0)),
+				inline : 1
+			}, {
+				plugin_url : url
+			});
+		});  
+
+		// Register buttons
+		ed.addButton('drupalimage', {
+			title : '{#drupalimage_dlg.desc}',
+			image: url + '/images/drupalimage.gif',
+			cmd : 'mceDrupalImage'
+		});
 	},
 	
 	cleanup : function(type, content) {
@@ -127,7 +149,7 @@ var TinyMCE_DrupalImagePlugin = {
 					// Reference: these are the default parameters that are valid for the
 					// TinyMCE image tags:
 					// img[class|src|border=0|alt|title|hspace|vspace|width|height|align]
-					content += '<img src="' + (tinyMCE.getParam('theme_href') + '/images/spacer.gif') + '"';
+					content += '<img src="' + (tinyMCE.activeEditor.getParam('theme_href') + '/images/spacer.gif') + '"';
 					content += ' width="' + attribs['width'] + '" height="' + attribs['height'] + '" align="' + attribs['align'] + '"';
 					content += ' alt="' + miscAttribs + '" title="' + miscAttribs + '" name="mceItemDrupalImage" class="mceItemDrupalImage" />';
 					content += contentAfter;
@@ -254,7 +276,10 @@ var TinyMCE_DrupalImagePlugin = {
 		}
 		return attributes;
 	}
-};
-
-tinyMCE.addPlugin("drupalimage", TinyMCE_DrupalImagePlugin);
+//};
+});
 
+//tinyMCE.addPlugin("drupalimage", TinyMCE_DrupalImagePlugin);
+// Register plugin
+tinymce.PluginManager.add('drupalimage', tinymce.plugins.DrupalImagePlugin);
+})();