Changeset 5316

Timestamp:

10/18/09 09:56:27 (2 years ago)

Author:

PaulHarvey

Message:

Item2270: Fix incorrect wordcount (always 6 words) when users first enter edit mode

Location:

trunk/TinyMCEPlugin

Files:

• data/System/TinyMCEPlugin.txt (modified) (1 diff)
• pub/System/TinyMCEPlugin/foswiki_tiny.js (modified) (2 diffs)
• pub/System/TinyMCEPlugin/foswiki_tiny_src.js (modified) (1 diff)

trunk/TinyMCEPlugin/data/System/TinyMCEPlugin.txt

@@ -136 +136 @@
 |  Release: | %$RELEASE% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
+|  18 Oct 2009 | Foswikitask:Item2270: Fix incorrect wordcount when user first enters edit mode |
 |  17 Oct 2009 | Foswikitask:Item2245: Upgrade to TinyMCE 3.2.7, enabled new standard plugin: wordcount|
 |  20 Sep 2009 | Foswikitask:Item2121: Remove 2 MB of developer files that are not used |

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki_tiny.js

@@ -22 +22 @@
 +"Please wait... retrieving page from server."
 +"</span>");FoswikiTiny.transform(editor,"tml2html",text,function(text,req,o){for(var i=0;i<FoswikiTiny.tml2html.length;i++){var cb=FoswikiTiny.tml2html[i];text=cb.apply(this,[this,text]);}
+if(this.plugins.wordcount!==undefined&&this.plugins.wordcount.blocked!==undefined){this.plugins.wordcount.blocked=0;}
 this.setContent(text);this.isNotDirty=true;FoswikiTiny.enableSaveButton(true);},function(type,req,o){this.setContent("<div class='foswikiAlert'>"
 +"There was a problem retrieving "
@@ -36 +37 @@
 return FoswikiTiny.metaTags[inKey];},install:function(){var tmce_init=this.getMetaTag('TINYMCEPLUGIN_INIT');if(tmce_init!=null){eval("tinyMCE.init({"+unescape(tmce_init)+"});");return;}
 alert("Unable to install TinyMCE; <META name='TINYMCEPLUGIN_INIT' is missing");},getTopicPath:function(){return this.getFoswikiVar("WEB")+'.'+this.getFoswikiVar("TOPIC");},getScriptURL:function(script){var scripturl=this.getFoswikiVar("SCRIPTURL");var suffix=this.getFoswikiVar("SCRIPTSUFFIX");if(suffix==null)suffix='';return scripturl+"/"+script+suffix;},getRESTURL:function(fn){return this.getScriptURL('rest')+"/WysiwygPlugin/"+fn;},getListOfAttachments:function(onSuccess){var url=this.getRESTURL('attachments');var path=this.getTopicPath();var params="nocache="+encodeURIComponent((new Date()).getTime())
-+"&topic="+encodeURIComponent(path);tinymce.util.XHR.send({url:url+"?"+params,type:"POST",content_type:"application/x-www-form-urlencoded",data:params,success:function(atts){if(atts!=null){onSuccess(eval(atts));}}});}};
++"&topic="+encodeURIComponent(path);tinymce.util.XHR.send({url:url+"?"+params,type:"POST",content_type:"application/x-www-form-urlencoded",data:params,success:function(atts){if(atts!=null){onSuccess(eval(atts));}}});}};;

trunk/TinyMCEPlugin/pub/System/TinyMCEPlugin/foswiki_tiny_src.js

@@ -238 +238 @@
                     text = cb.apply(this, [ this, text ]);
                 }
+                /* SMELL: Work-around for Item2270. In future this plugin may
+                   be updated so that this needs to be changed. TMCE's wordcount
+                   plugin limits itself to a max. of one count per
+                   2 seconds, so users always see a wordcount of 6 (Please
+                   wait... retrieving page from server) when they first edit a
+                   document. So remove lock before setContent() */
+                if (this.plugins.wordcount !== undefined &&
+                  this.plugins.wordcount.blocked !== undefined) {
+                    this.plugins.wordcount.blocked = 0;
+                }
                 this.setContent(text);
                 this.isNotDirty = true;