Item14584: make wikiword backwards compatible

foswiki · Dec 17, 2017 · 704791e · 704791e
1 parent 1ae8006
commit 704791e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/WIKIWORD.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/WIKIWORD.pm
@@ -28,7 +28,7 @@ sub new {
     my $this = bless(
         $class->SUPER::new(
             name       => 'WikiWord',
-            version    => '3.20',
+            version    => '3.21',
             author     => 'Michael Daum',
             homepage   => 'http://foswiki.org/Extensions/JQueryPlugin',
             javascript => ['wikiword.js'],

diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/wikiword/jquery.wikiword.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/plugins/wikiword/jquery.wikiword.uncompressed.js
@@ -1,5 +1,5 @@
 /*
- * jQuery WikiWord plugin 3.20
+ * jQuery WikiWord plugin 3.21
  *
  * Copyright (c) 2008-2017 Foswiki Contributors http://foswiki.org
  *
@@ -42,7 +42,12 @@ $.wikiword = {
 
       // either a string or a jQuery object
       if (typeof(thisOpts.source) === 'string') {
+        // first try to find the source within the same form
         $source = $this.parents("form:first").find(thisOpts.source);
+        // if that fails, try in a global scope
+        if ($source.length === 0) {
+          $source = $(thisOpts.source);
+        }
       } else {
         $source = thisOpts.source;
       }

diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/wikiword/wikiword.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/plugins/wikiword/wikiword.uncompressed.js
@@ -1,5 +1,5 @@
 /*
- * jQuery WikiWord plugin 3.20
+ * jQuery WikiWord plugin 3.21
  *
  * Copyright (c) 2008-2017 Foswiki Contributors http://foswiki.org
  *
@@ -42,7 +42,12 @@ $.wikiword = {
 
       // either a string or a jQuery object
       if (typeof(thisOpts.source) === 'string') {
+        // first try to find the source within the same form
         $source = $this.parents("form:first").find(thisOpts.source);
+        // if that fails, try in a global scope
+        if ($source.length === 0) {
+          $source = $(thisOpts.source);
+        }
       } else {
         $source = thisOpts.source;
       }