Permalink
Browse files

Item14584: Merge branch 'Item14584'

  • Loading branch information...
MichaelDaum committed Dec 17, 2017
2 parents c22288f + 704791e commit 7be6c105039803e8ad4c81d6bcc40fd20a75adee
@@ -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'],
@@ -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;
}
@@ -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;
}
@@ -234,7 +234,7 @@ sub registerAccount {
}
else {
$this->assert_matches(
qr/$Foswiki::cfg{WebMasterName} <$Foswiki::cfg{WebMasterEmail}>/,
qr/"?$Foswiki::cfg{WebMasterName}"? <$Foswiki::cfg{WebMasterEmail}>/,
$mail->header('To')
);
}
@@ -796,7 +796,7 @@ sub _registerBadVerify {
$this->assert_equals( 1, scalar(@FoswikiFnTestCase::mails) );
my $mess = $FoswikiFnTestCase::mails[0];
$this->assert_matches(
qr/$Foswiki::cfg{WebMasterName} <$Foswiki::cfg{WebMasterEmail}>/,
qr/"?$Foswiki::cfg{WebMasterName}"? <$Foswiki::cfg{WebMasterEmail}>/,
$mess->header('From') );
$this->assert_matches( qr/.*\b$this->{new_user_email}\b/,
$mess->header('To') );
@@ -869,7 +869,7 @@ sub _registerNoVerifyOk {
}
else {
$this->assert_matches(
qr/$Foswiki::cfg{WebMasterName} <$Foswiki::cfg{WebMasterEmail}>/,
qr/"?$Foswiki::cfg{WebMasterName}"? <$Foswiki::cfg{WebMasterEmail}>/,
$mail->header('To')
);
}
@@ -1212,7 +1212,7 @@ sub verify_rejectDuplicateEmail {
}
else {
$this->assert_matches(
qr/$Foswiki::cfg{WebMasterName} <$Foswiki::cfg{WebMasterEmail}>/,
qr/"?$Foswiki::cfg{WebMasterName}"? <$Foswiki::cfg{WebMasterEmail}>/,
$mail->header('To')
);
}
@@ -1474,7 +1474,7 @@ sub verify_rejectFilteredEmail {
}
else {
$this->assert_matches(
qr/$Foswiki::cfg{WebMasterName} <$Foswiki::cfg{WebMasterEmail}>/,
qr/"?$Foswiki::cfg{WebMasterName}"? <$Foswiki::cfg{WebMasterEmail}>/,
$mail->header('To')
);
}
@@ -1810,7 +1810,7 @@ sub verify_resetPasswordOkay {
$this->assert_equals( 1, scalar(@FoswikiFnTestCase::mails) );
my $mess = $FoswikiFnTestCase::mails[0];
$this->assert_matches(
qr/$Foswiki::cfg{WebMasterName} <$Foswiki::cfg{WebMasterEmail}>/,
qr/"?$Foswiki::cfg{WebMasterName}"? <$Foswiki::cfg{WebMasterEmail}>/,
$mess->header('From') );
$this->assert_matches( qr/.*\b$this->{new_user_email}/,
$mess->header('To') );
@@ -2624,7 +2624,7 @@ sub verify_resetPassword_NoWikiUsersEntry {
$this->assert_equals( 1, scalar(@FoswikiFnTestCase::mails) );
my $mess = $FoswikiFnTestCase::mails[0];
$this->assert_matches(
qr/$Foswiki::cfg{WebMasterName} <$Foswiki::cfg{WebMasterEmail}>/,
qr/"?$Foswiki::cfg{WebMasterName}"? <$Foswiki::cfg{WebMasterEmail}>/,
$mess->header('From') );
$this->assert_matches( qr/.*\b$this->{new_user_email}/,
$mess->header('To') );
@@ -3028,12 +3028,12 @@ sub verify_registerVerifyOKApproved {
# Make sure the confirmations are sent; one to the user, one to the admin
$this->assert_equals( 2, scalar(@FoswikiFnTestCase::mails) );
foreach my $mail (@FoswikiFnTestCase::mails) {
if ( $mail->header('To') =~ m/^Wiki/m ) {
$this->assert_matches( qr/^Wiki Administrator/m,
if ( $mail->header('To') =~ m/^"?Wiki/m ) {
$this->assert_matches( qr/^"?Wiki Administrator"?/m,
$mail->header('To') );
}
else {
$this->assert_matches( qr/^Walter Pigeon/m,
$this->assert_matches( qr/^"?Walter Pigeon"?/m,
$mail->header('To') );
}
$this->assert_matches(
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1513393570" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1513438812" format="1.1" version="1"}%
%META:TOPICPARENT{name="ReleaseHistory"}%
---+!! Foswiki Release 2.1.5-Beta1
@@ -566,7 +566,7 @@ Foswiki thanks the Translators for their efforts. If you are interesting in hel
| [[%BUGS%/Item14554][Item14554]] | Remove link to unused wikiring.com domain. |
| [[%BUGS%/Item14556][Item14556]] | Clean up page header area with PatternSkin. |
| [[%BUGS%/Item14557][Item14557]] | PerlDependencyReport crashes under some conditions. |
| [[%BUGS%/Item14559][Item14559]] | Regression via [[Tasks.Item13898][Item13898]] - broken topic selectors. |
| [[%BUGS%/Item14559][Item14559]] | Regression via Item13898 - broken topic selectors. |
| [[%BUGS%/Item14560][Item14560]] | WikiWord changes don't trigger a change event on the target element. |
| [[%BUGS%/Item14566][Item14566]] | Don't cache a null result in foswiki.getPreference(). |
| [[%BUGS%/Item14573][Item14573]] | Fix auto-height calculation of tabpane. |

0 comments on commit 7be6c10

Please sign in to comment.