Item8445: Fix IE compatibility, include web parameter when linking to…

… TagMeSearch from tag items git-svn-id: http://svn.foswiki.org/trunk/TagMePlugin@6613 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Mar 2, 2010 · 318178f · 318178f
1 parent 7b475ee
commit 318178f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/data/System/TagMeAjaxHelper.txt b/data/System/TagMeAjaxHelper.txt
@@ -52,7 +52,7 @@
 %TAGME{tpaction="showalltags"
   web="%URLPARAM{"tpweb"}%"
   by="%URLPARAM{"tpuser"}%"
-  format="<a href='%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/TagMeSearch?tag=$tag;by=%URLPARAM{ "tpuser" }%;qcallingweb=%URLPARAM{"qcallingweb"}%' style='font-size:$size%' title='%MAKETEXT{"Other topics with this tag"}%'>$tag</a>"
+  format="<a href='%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/TagMeSearch?tag=$tag;by=%URLPARAM{ "tpuser" }%;qcallingweb=%URLPARAM{"qcallingweb"}%;web=%URLPARAM{"tpweb"}%' style='font-size:$size%' title='%MAKETEXT{"Other topics with this tag"}%'>$tag</a>"
   separator=" "
   minsize="94"
   maxsize="220"

diff --git a/data/System/TagMePlugin.txt b/data/System/TagMePlugin.txt
@@ -385,7 +385,8 @@ topic. Use the standard preference setting topics, such as
 |  Version: | %$VERSION% |
 |  Release: | %$RELEASE% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  31 Jan 2010: | Foswiki:Main.PaulHarvey: Added an interactive user interface implemented with JQuery; ship missing blog style tmpl files; fix docs/implementation of newtagsandadd |
+|  02 Mar 2010: | Foswiki:Main.PaulHarvey: Fix IE compatibility, link tag items to TagMeSearch topic with web parameter |
+|  01 Mar 2010: | Foswiki:Main.PaulHarvey: Added an interactive user interface implemented with JQuery; ship missing blog style tmpl files; fix docs/implementation of newtagsandadd |
 |  11 Jun 2009: | Foswiki port, and moved settings out of this topic |
 |  30 Aug 2008: | Foswiki:Main.ColasNahaboo: enhancements to the "blog" style: Bundles, count of known tags, option to delete tags |
 |  28 Aug 2008: | Foswiki:Main.ColasNahaboo: prefix & suffix options renamed as header & footer. New parameter style to TAGME to be able to define different UI style for the default "show" action of TAGME. Implemented a first one, "blog" for the simpler case of authors managing the same tags |

diff --git a/lib/Foswiki/Plugins/TagMePlugin.pm b/lib/Foswiki/Plugins/TagMePlugin.pm
@@ -35,7 +35,7 @@ use vars qw(
 );
 
 our $VERSION           = '$Rev$';
-our $RELEASE           = '28 Feb 2010';
+our $RELEASE           = '02 Mar 2010';
 our $NO_PREFS_IN_TOPIC = 1;
 our $SHORTDESCRIPTION =
   'Tag wiki content collectively to find content by keywords';

diff --git a/lib/Foswiki/Plugins/TagMePlugin/MANIFEST b/lib/Foswiki/Plugins/TagMePlugin/MANIFEST
@@ -1,3 +1,4 @@
+data/System/TagMePlugin.txt 0644
 data/System/TagMeAjaxHelper.txt 0644
 data/System/TagMeChangeRequests.txt 0644
 data/System/TagMeCreateNewTag.txt 0644

diff --git a/pub/System/TagMeAjaxHelper/jquery.tagmeui.uncompressed.js b/pub/System/TagMeAjaxHelper/jquery.tagmeui.uncompressed.js
@@ -153,19 +153,17 @@ jQuery(document).ready(function () {
                     ** I don't know it... yet. .text('') destroys child elements we want to
                     ** keep. */
                     function removeTextNodes(element) {
-                        $(element).contents().filter(
-                            function () {
-                                if (this.nodeType === Node.TEXT_NODE) {
-                                    this.textContent = '';
-                                }
-                            }
-                        );
+                        if ( (typeof(element.lastChild) === 'object') && 
+                            (element.lastChild !== null) ) {
+                            element.lastChild.data = '';
+                        }
 
                         return;
                     }
 
                     tagQuery.SET('tag', theTag);
                     tagQuery.SET('qcallingweb', foswiki.web);
+                    tagQuery.SET('web', foswiki.web);
                     removeTextNodes(tagSpan);
                     $(tagSpan).append('<a href="' + that.settings.tagLinkUrl + 
                         tagQuery.toString() + '" title="' +