Changeset 5714

Timestamp:

12/04/09 05:10:05 (2 years ago)

Author:

PaulHarvey

Message:

Item2453: Worked around weird JQuery bug when NatEdit is invoked with ?action=form, resulting in data loss.

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) (2 diffs)

trunk/NatEditPlugin/data/System/NatEditPlugin.txt

@@ -88 +88 @@
 |  Version: | %$VERSION% |
 |  Change History: | |
+|  04 Dec 2009 | Foswikitask:Item2453: Form data not saved when edit is invoked \
+                 with ?action=form ('Edit data form of this topic' link) |
 |  18 Nov 2009 | Foswikitask:Item2373: improve XHTML validation |
 |  17 Nov 2009 | Foswikitask:Item2368 toolbar not always hidden (PH); \

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

@@ -3 +3 @@
 function fixHeightOfPane(){}
 (function($){function submitEditForm(script,action){var topicText=$("#topic").val();$("#savearea").val(topicText);if(typeof(beforeSubmitHandler)=='function'){if(beforeSubmitHandler(script,action)===false){return false;}}
-var editForm=$("#EditForm");if(action=='add form'){editForm.find("input[name='submitChangeForm']").val(action);}
+var editForm=$(document.getElementById('EditForm'));if(action=='add form'){editForm.find("input[name='submitChangeForm']").val(action);}
 editForm.find("input[name='action_preview']").val('');editForm.find("input[name='action_save']").val('');editForm.find("input[name='action_checkpoint']").val('');editForm.find("input[name='action_addform']").val('');editForm.find("input[name='action_replaceform']").val('');editForm.find("input[name='action_cancel']").val('');editForm.find("input[name='action_"+action+"']").val('foobar');if(typeof(foswikiStrikeOne)!='undefined'){foswikiStrikeOne(editForm[0]);}
-if(typeof(tinyMCE)!=='undefined'&&typeof(tinyMCE.activeEditor)!=='undefined'){tinyMCE.activeEditor.onSubmit.dispatch();}
+if((typeof(tinyMCE)==='object')&&(typeof(tinyMCE.activeEditor)==='object')&&(tinyMCE.activeEditor!==null)){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')});jQuery(window).load(function(){if((typeof(tinyMCE)==='object')&&typeof(tinyMCE.activeEditor==='object')){$(".natEditToolBar").hide();$("#topic_fullscreen").parent().remove();$(window).trigger('resize.natedit');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();}};}});});})(jQuery);;

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

@@ -15 +15 @@
       }
     }
-    var editForm = $("#EditForm");
+    /* SMELL: Why doesn't this work when ?action=form? Item2453
+       var editForm = $('#EditForm'); */
+    var editForm = $(document.getElementById('EditForm'));
     if (action == 'add form') {
       editForm.find("input[name='submitChangeForm']").val(action);
@@ -29 +31 @@
       foswikiStrikeOne(editForm[0]);
     }
-    if (typeof(tinyMCE) !== 'undefined' && typeof(tinyMCE.activeEditor) !== 'undefined') {
+    if ((typeof(tinyMCE) === 'object') && 
+      (typeof(tinyMCE.activeEditor) === 'object') &&
+      (tinyMCE.activeEditor !== null)) {
       tinyMCE.activeEditor.onSubmit.dispatch();
     }