Changeset 5416

Timestamp:

11/02/09 04:25:00 (3 years ago)

Author:

PaulHarvey

Message:

Item2281: Trigger TinyMCE resize in transition from NatEdit back to WYSIWYG

Location:

trunk/NatEditPlugin

Files:

• data/System/NatEditPlugin.txt (modified) (1 diff)
• pub/System/NatEditPlugin/edit.js (modified) (1 diff)
• pub/System/NatEditPlugin/edit.js.gz (modified) (previous)
• pub/System/NatEditPlugin/edit.uncompressed.js (modified) (1 diff)
• pub/System/NatEditPlugin/jquery.natedit.js.gz (modified) (previous)

trunk/NatEditPlugin/data/System/NatEditPlugin.txt

@@ -88 +88 @@
 |  Version: | %$VERSION% |
 |  Change History: | |
+|  02 Nov 2009 | Foswikitask:Item2281: attempt to make <nop>TinyMCE resize \
+                 automatically as <nop>NatEdit does |
 |  14 Sep 2009 | yet another attempt to support <nop>TinyMCEPlugin; \
                  don't take over raw edit automatically; \

trunk/NatEditPlugin/pub/System/NatEditPlugin/edit.js

@@ -7 +7 @@
 if(typeof(tinyMCE)!=='undefined'&&typeof(tinyMCE.activeEditor)!=='undefined'){tinyMCE.activeEditor.onSubmit.dispatch();}
 editForm.submit();return false;}
-$(function(){$("input[name='TopicTitle']:eq(1)").parents(".foswikiFormStep").remove();$("input[name='Summary']:eq(1)").parents(".foswikiFormStep").remove();$("#save").click(function(){return submitEditForm('save','save')});$("#checkpoint").click(function(){return submitEditForm('save','checkpoint')});$("#preview").click(function(){return submitEditForm('preview','preview')});$("#cancel").click(function(){return submitEditForm('save','cancel')});$("#replaceform").click(function(){return submitEditForm('save','replaceform')});$("#addform").click(function(){return submitEditForm('save','addform')});window.setTimeout(function(){if($("#topic_ifr").length){$(".natEditToolBar").hide();$("#topic_fullscreen").parent().remove();var oldSwitchToWYSIWYG=FoswikiTiny.switchToWYSIWYG;FoswikiTiny.switchToWYSIWYG=function(inst){$(".natEditToolBar").hide();$("#wysiwyg").hide();oldSwitchToWYSIWYG(inst);};var oldSwitchToRaw=FoswikiTiny.switchToRaw;var doneInit=false;FoswikiTiny.switchToRaw=function(inst){oldSwitchToRaw(inst);$(window).trigger("resize");var oldWysiwygButton=$("#topic_2WYSIWYG");var newWysiwygButton=$("#wysiwyg");$(".natEditToolBar").show();if(!doneInit){doneInit=true;var onClickHandler=oldWysiwygButton.attr('onclick');oldWysiwygButton.replaceWith(newWysiwygButton);newWysiwygButton.click(onClickHandler).show();}else{oldWysiwygButton.hide();newWysiwygButton.show();}};}},100);});})(jQuery);;
+$(function(){$("input[name='TopicTitle']:eq(1)").parents(".foswikiFormStep").remove();$("input[name='Summary']:eq(1)").parents(".foswikiFormStep").remove();$("#save").click(function(){return submitEditForm('save','save')});$("#checkpoint").click(function(){return submitEditForm('save','checkpoint')});$("#preview").click(function(){return submitEditForm('preview','preview')});$("#cancel").click(function(){return submitEditForm('save','cancel')});$("#replaceform").click(function(){return submitEditForm('save','replaceform')});$("#addform").click(function(){return submitEditForm('save','addform')});window.setTimeout(function(){if($("#topic_ifr").length){$(".natEditToolBar").hide();$("#topic_fullscreen").parent().remove();var oldSwitchToWYSIWYG=FoswikiTiny.switchToWYSIWYG;FoswikiTiny.switchToWYSIWYG=function(inst){$(".natEditToolBar").hide();$("#wysiwyg").hide();oldSwitchToWYSIWYG(inst);$(window).trigger('resize.natedit');};var oldSwitchToRaw=FoswikiTiny.switchToRaw;var doneInit=false;FoswikiTiny.switchToRaw=function(inst){oldSwitchToRaw(inst);$(window).trigger("resize");var oldWysiwygButton=$("#topic_2WYSIWYG");var newWysiwygButton=$("#wysiwyg");$(".natEditToolBar").show();if(!doneInit){doneInit=true;var onClickHandler=oldWysiwygButton.attr('onclick');oldWysiwygButton.replaceWith(newWysiwygButton);newWysiwygButton.click(onClickHandler).show();}else{oldWysiwygButton.hide();newWysiwygButton.show();}};}},100);});})(jQuery);;

trunk/NatEditPlugin/pub/System/NatEditPlugin/edit.uncompressed.js

@@ -61 +61 @@
           $("#wysiwyg").hide();
           oldSwitchToWYSIWYG(inst);
+          $(window).trigger('resize.natedit');
         };