Changeset 5654 for trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage

Timestamp:

11/25/09 23:29:19 (2 years ago)

Author:

PaulHarvey

Message:

Item2412: Merge from release branch: Fix image insert dialog (r5628), bump release version & rebuild, apply eol-style (r5629, r5630)

Location:

trunk/TinyMCEPlugin

Files:

• . (modified) (1 prop)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage (modified) (1 prop)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/advimage.css (deleted)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/advimage_src.css (deleted)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/foswikiimage.css (copied) (copied from branches/Release01x00/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/foswikiimage.css)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/foswikiimage_src.css (copied) (copied from branches/Release01x00/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/css/foswikiimage_src.css)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/editor_plugin.js (modified) (1 diff, 1 prop)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/editor_plugin_src.js (modified) (1 diff, 1 prop)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/image.htm (modified) (1 diff, 1 prop)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/js/image.js (modified) (1 diff, 1 prop)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/langs/en.js (modified) (1 prop)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/langs/en_dlg.js (modified) (1 prop)
• pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/readme.txt (modified) (1 prop)

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/editor_plugin.js

@@ -1 @@
-(function(){tinymce.PluginManager.requireLangPack('foswikiimage');tinymce.create('tinymce.plugins.FoswikiImage',{init:function(ed,url){ed.addCommand('foswikiimage',function(){ed.windowManager.open({location:false,menubar:false,toolbar:false,status:false,url:url+'/image.htm',width:480,height:385,movable:true,inline:true},{plugin_url:url,attach_url:FoswikiTiny.getFoswikiVar("PUBURL")+'/'
+(function(){tinymce.PluginManager.requireLangPack('foswikiimage');tinymce.create('tinymce.plugins.FoswikiImage',{init:function(ed,url){ed.addCommand('foswikiimage',function(){ed.windowManager.open({location:false,menubar:false,toolbar:false,status:false,url:url+'/image.htm',width:550,height:400,movable:true,inline:true},{plugin_url:url,attach_url:FoswikiTiny.getFoswikiVar("PUBURL")+'/'
 +FoswikiTiny.getFoswikiVar("WEB")+'/'
 +FoswikiTiny.getFoswikiVar("TOPIC")+'/',vars:ed.getParam("foswiki_vars","")});});ed.addButton('image',{title:'foswikiimage.image_desc',cmd:'foswikiimage'});},getInfo:function(){return{longname:'Foswiki image',author:'Crawford Currie, from Moxiecode Systems AB original',authorurl:'http://c-dot.co.uk.com',infourl:'http://foswiki.org/Extensions/TinyMCEPlugin',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},_nodeChange:function(ed,cm,n,co){if(n==null)

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/editor_plugin_src.js

@@ -30 +30 @@
                     status: false,
                     url : url + '/image.htm',
-                    width : 480,
-                    height : 385,
+                    width : 550,
+                    height : 400,
                     movable : true,
                     inline : true

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/image.htm

@@ -36 +36 @@
         </table>
        </td>
-       <td colspan="2">
+       <td rowspan="0" valign="top" colspan="2">
                 {#foswikiimage_dlg.img_url_help}
        </td>

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/jscripts/tiny_mce/plugins/foswikiimage/js/image.js

@@ -310 +310 @@
                 for (var i = 0; i < atts.length; i++) {
                     for (var j = 0; j < ids.length; j++) {
-                        lsts[j].options[i] =
+                        /* +1 so as not to overwrite existing null option
+                         * defined in the static HTML. Item2412 */
+                        lsts[j].options[i+1] =
                             new Option(atts[i].name, atts[i].name);
                     }