svn commit: r586758 - in /lenya/trunk/src/modules/tinymce/resources: javascript/tiny_lenya_glue.js tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js

Author: ragaller
Date: Sat Oct 20 09:57:27 2007
New Revision: 586758

URL: http://svn.apache.org/viewvc?rev=586758&view=rev
Log:
tinyMCE: transfer image width, height ant title (@alt) to the simplebrowser window. Fixes Bug 43203

Modified:
    lenya/trunk/src/modules/tinymce/resources/javascript/tiny_lenya_glue.js
    lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js

Modified: lenya/trunk/src/modules/tinymce/resources/javascript/tiny_lenya_glue.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/resources/javascript/tiny_lenya_glue.js?rev=586758&r1=586757&r2=586758&view=diff
==============================================================================
--- lenya/trunk/src/modules/tinymce/resources/javascript/tiny_lenya_glue.js (original)
+++ lenya/trunk/src/modules/tinymce/resources/javascript/tiny_lenya_glue.js Sat Oct 20 09:57:27 2007
@@ -47,7 +47,7 @@
 /* interface to generic editor usecases */
 
 org.apache.lenya.editors.setObjectData = function(objectData) {
-  TinyMCE_SimpleBrowserPlugin.browserCallback(objectData.url);
+  TinyMCE_SimpleBrowserPlugin.browserCallback(objectData);
 }
 
 org.apache.lenya.editors.getObjectData = function() {

Modified: lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js?rev=586758&r1=586757&r2=586758&view=diff
==============================================================================
--- lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js (original)
+++ lenya/trunk/src/modules/tinymce/resources/tinymce/jscripts/tiny_mce/plugins/simplebrowser/editor_plugin.js Sat Oct 20 09:57:27 2007
@@ -91,7 +91,10 @@
 
 	browserCallback : function(returnValue) {
 		if(!returnValue) return;
-		TinyMCE_SimpleBrowserPlugin.options['target'].document.forms[0].elements[TinyMCE_SimpleBrowserPlugin.options['field']].value = returnValue;
+		TinyMCE_SimpleBrowserPlugin.options['target'].document.forms[0].elements[TinyMCE_SimpleBrowserPlugin.options['field']].value = returnValue.url;
+		TinyMCE_SimpleBrowserPlugin.options['target'].document.forms[0].elements.width.value = returnValue.width;
+		TinyMCE_SimpleBrowserPlugin.options['target'].document.forms[0].elements.height.value = returnValue.height;
+		TinyMCE_SimpleBrowserPlugin.options['target'].document.forms[0].elements.alt.value = returnValue.title;
 	}
 };