Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item13580: missing image in natedit help text
and some minor improvements
  • Loading branch information
MichaelDaum committed Jul 29, 2015
1 parent fc117ad commit a4e76bd
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
3 changes: 2 additions & 1 deletion NatEditPlugin/data/System/NatEditHelpText.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1437500521" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1438175794" format="1.1" version="1"}%
%META:TOPICPARENT{name="NatEditPlugin"}%
---+ %TOPIC%
Help text for the NatEditPlugin editor
Expand All @@ -19,3 +19,4 @@ Note that you can still enter <nop>TML into the WYSIWYG editor, but you must us

<h3 >Wiki markup editing shorthands</h3>
%INCLUDE{"%SYSTEMWEB%.EditingShorthand"}%%ENDSECTION{"default"}%
%META:FILEATTACHMENT{name="wikitext.png" attachment="wikitext.png" attr="h" comment="" date="1438175794" size="1777" user="ProjectContributor" version="1"}%
12 changes: 3 additions & 9 deletions NatEditPlugin/data/System/NatEditPlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1437500521" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1438175794" format="1.1" version="1"}%
---+!! Natural Edit Plugin
%TOC%

Expand Down Expand Up @@ -56,6 +56,7 @@ is sufficient.

| Copyright &copy;: | 2007-2015 Michael Daum http://michaeldaumconsulting.com |
| Change History: | |
| 29 Jul 2015 | added missing image in documentation |
| 06 Mar 2015 | fixed permissions editor |
| 25 Sep 2014 | move templating to new jsrender replacing deprecated jquery.tmpl |
| 12 Dec 2013 | rewrite all of the js code; make it themable using jquery-ui |
Expand Down Expand Up @@ -175,11 +176,4 @@ is sufficient.
%META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/%25$ROOTMODULE%25"}%
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/%25$ROOTMODULE%25"}%
%META:FILEATTACHMENT{name="styles.uncompressed.css" attr="h" comment="" date="1437500521" size="6120" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="styles.css" attr="h" comment="" date="1437500521" size="4869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1437500521" size="64487" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1437500521" size="139" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.natedit.uncompressed.js" attr="h" comment="" date="1437500521" size="74611" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="styles.css.gz" attr="h" comment="" date="1437500521" size="1754" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.natedit.js" attr="h" comment="" date="1437500521" size="46229" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.natedit.js.gz" attr="h" comment="" date="1437500521" size="11955" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1438175794" size="64487" user="ProjectContributor" version="1"}%
2 changes: 1 addition & 1 deletion NatEditPlugin/data/System/NatEditWordHelpText.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1423445948" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1438175794" format="1.1" version="1"}%
%META:TOPICPARENT{name="NatEditPlugin"}%
---+ %TOPIC%
Help text for the NatEditPlugin editor
Expand Down
4 changes: 2 additions & 2 deletions NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm
Expand Up @@ -30,8 +30,8 @@ BEGIN {
}
}

our $VERSION = '9.02';
our $RELEASE = '06 Mar 2015';
our $VERSION = '9.03';
our $RELEASE = '29 Jul 2015';
our $NO_PREFS_IN_TOPIC = 1;
our $SHORTDESCRIPTION = 'A Wikiwyg Editor';
our $baseWeb;
Expand Down
2 changes: 1 addition & 1 deletion NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin/NATEDIT.pm
Expand Up @@ -43,7 +43,7 @@ sub new {
my $this = bless(
$class->SUPER::new(
name => 'NatEdit',
version => '4.00',
version => '4.01',
author => 'Michael Daum',
homepage => 'http://foswiki.org/Extensions/NatEditPlugin',
puburl => '%PUBURLPATH%/%SYSTEMWEB%/NatEditPlugin',
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Expand Up @@ -262,6 +262,9 @@ $.NatEditor = function(txtarea, opts) {
if (self.opts.autoMaxExpand) {
$txtarea.addClass("ui-natedit-autoexpand");
self.autoMaxExpand();

// disabled height property in parent container
self.container.parent().css("cssText", "height: auto !important");
}

/* establish auto expand */
Expand Down Expand Up @@ -1577,9 +1580,10 @@ $.NatEditor.prototype.insertLink = function(opts) {

if (typeof(opts.text) !== 'undefined' && opts.text != '') {
markup += "["+opts.text+"]";
}
} else {
markup += "["+opts.file+"]";
}
markup += "]";

}

} else {
Expand Down
2 changes: 1 addition & 1 deletion NatEditPlugin/templates/editform.natedit.tmpl
@@ -1,4 +1,4 @@
%TMPL:INCLUDE{"edit"}%
%TMPL:DEF{"title"}%%TMPL:P{"topictitle"}% (%MAKETEXT{"edit form"}%) - %WIKITOOLNAME%%TMPL:END%
%TMPL:DEF{"titleaction"}%%IF{"defined 'rev'" then="%MAKETEXT{"restore form"}%" else="%MAKETEXT{"edit form"}%"}%%TMPL:END%
%TMPL:DEF{"firsttab"}%<textarea class="natedit foswikiHidden" data-show-toolbar="false"></textarea>%TMPL:END%
%TMPL:DEF{"firsttab"}%<textarea class="natedit foswikiHidden" data-show-toolbar="false" name="text">%TEXT%</textarea>%TMPL:END%
5 changes: 3 additions & 2 deletions NatEditPlugin/templates/settings.natedit.tmpl
@@ -1,7 +1,8 @@
%TMPL:INCLUDE{"settings"}%
%TMPL:INCLUDE{"settingstoolbar"}%

%TMPL:DEF{"content"}%%TMPL:P{"contenttitle"}%<form id="EditForm" name="EditForm" method="post" action="%SCRIPTURLPATH{"manage"}%/%WEB%/%TOPIC%">
%TMPL:DEF{"content"}%%TMPL:P{"contenttitle"}%<div class="ui-natedit-container">
<form id="EditForm" name="EditForm" method="post" action="%SCRIPTURLPATH{"manage"}%/%WEB%/%TOPIC%">
<input type="submit" style="display:none" />
<input type="hidden" name="action_addform" value="" />
<input type="hidden" name="action_cancel" value="" />
Expand All @@ -16,7 +17,7 @@
<textarea class="foswikiTextArea natedit" name="text" id="topic" wrap="virtual" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" style="%EDITBOXSTYLE%">%TEXT%</textarea>
%ENDTAB%
%TMPL:P{"helptab"}%%ENDTABPANE%
%TMPL:P{"bottomtopicactions"}%%TMPL:P{"formend"}%</form>%TMPL:END%
%TMPL:P{"bottomtopicactions"}%</form></div>%TMPL:END%

%TMPL:DEF{"helptab"}%%TAB{"%MAKETEXT{"Help"}%"}% %TMPL:P{"settingshelp"}% %ENDTAB%%TMPL:END%

Expand Down

0 comments on commit a4e76bd

Please sign in to comment.