Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Gilbert Seilheimer committed Aug 10, 2012
1 parent 2514bcb commit b4b3689
Show file tree
Hide file tree
Showing 15 changed files with 248 additions and 128 deletions.
90 changes: 45 additions & 45 deletions config.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,52 +11,52 @@

// AddOn-MARKITUP

//////////////////////////////////////////////////////////////////////////////////
// CONFIG
//////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////
// CONFIG
//////////////////////////////////////////////////////////////////////////////////

// VARs
$addon_name = "gs_markitup";
// VARs
$addon_name = "gs_markitup";

// Sprachdateien anhaengen
if(TRUE == $REX['REDAXO'])
{
$I18N->appendFile($REX['INCLUDE_PATH'].'/addons/'.$addon_name.'/lang/');
}
$REX['ADDON']['rxid'][$addon_name] = '711';
$REX['ADDON']['page'][$addon_name] = "markitup";
if(TRUE == $REX['REDAXO'])
{
$REX['ADDON']['name'][$addon_name] = $I18N->msg("addon_name");
}
// Recht um das AddOn zu aendern
$REX['ADDON']['perm'][$addon_name] = 'markitup[1]';
// Credits
$REX['ADDON']['version'][$addon_name] = '1.1.12';
$REX['ADDON']['author'][$addon_name] = 'Gilbert Seilheimer';
$REX['ADDON']['supportpage'][$addon_name] = 'forum.redaxo.org';
// *************
$REX['PERM'][] = 'markitup[1]';
$REX['PERM'][] = 'markitup[2]';
// Fuer die Benutzervewaltung
$REX['EXTPERM'][] = 'markitup[3]';
// Sprachdateien anhaengen
if(TRUE == $REX['REDAXO'])
{
$I18N->appendFile($REX['INCLUDE_PATH'].'/addons/'.$addon_name.'/lang/');
}
$REX['ADDON']['rxid'][$addon_name] = '711';
$REX['ADDON']['page'][$addon_name] = "markitup";
if(TRUE == $REX['REDAXO'])
{
$REX['ADDON']['name'][$addon_name] = $I18N->msg("addon_name");
}
// Recht um das AddOn zu aendern
$REX['ADDON']['perm'][$addon_name] = 'markitup[1]';
// Credits
$REX['ADDON']['version'][$addon_name] = '1.1.12';
$REX['ADDON']['author'][$addon_name] = 'Gilbert Seilheimer';
$REX['ADDON']['supportpage'][$addon_name] = 'forum.redaxo.org';
// *************
$REX['PERM'][] = 'markitup[1]';
$REX['PERM'][] = 'markitup[2]';
// Fuer die Benutzervewaltung
$REX['EXTPERM'][] = 'markitup[3]';

//////////////////////////////////////////////////////////////////////////////////
// SUBPAGES
//////////////////////////////////////////////////////////////////////////////////
if(TRUE == $REX['REDAXO'])
{
$REX['ADDON'][$addon_name]['SUBPAGES'] =
array(
array('readme', $I18N->msg('addon_subpage_readme')),
array('modul', $I18N->msg('addon_subpage_modul'))
);
}
//////////////////////////////////////////////////////////////////////////////////
// SUBPAGES
//////////////////////////////////////////////////////////////////////////////////
if(TRUE == $REX['REDAXO'])
{
$REX['ADDON'][$addon_name]['SUBPAGES'] =
array(
array('readme', $I18N->msg('addon_subpage_readme')),
array('modul', $I18N->msg('addon_subpage_modul'))
);
}
?>
42 changes: 42 additions & 0 deletions files/jquery.autogrow-textarea.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
(function($) {
/*
* Auto-growing textareas; technique ripped from Facebook
*/
$.fn.autogrow = function(options) {

this.filter('textarea').each(function() {

var $this = $(this),
minHeight = $this.height(),
lineHeight = $this.css('lineHeight');
var shadow = $('<div></div>').css({
position: 'absolute',
top: -10000,
left: -10000,
width: $(this).width() - parseInt($this.css('paddingLeft')) - parseInt($this.css('paddingRight')),
fontSize: $this.css('fontSize'),
fontFamily: $this.css('fontFamily'),
lineHeight: $this.css('lineHeight'),
resize: 'none'
}).appendTo(document.body);
var update = function() {
var times = function(string, number) {
for (var i = 0, r = ''; i < number; i ++) r += string;
return r;
};
var val = this.value.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
.replace(/&/g, '&amp;')
.replace(/\n$/, '<br/>&nbsp;')
.replace(/\n/g, '<br/>')
.replace(/ {2,}/g, function(space) { return times('&nbsp;', space.length -1) + ' ' });
shadow.html(val);
$(this).css('height', Math.max(shadow.height() + 20, minHeight));
}
$(this).change(update).keyup(update).keydown(update);
update.apply(this);
});
return this;
}

})(jQuery);
2 changes: 1 addition & 1 deletion files/jquery.markitup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// markItUp! Universal MarkUp Engine, JQuery plugin
// v 1.1.x
// Dual licensed under the MIT and GPL licenses.
Expand Down
55 changes: 55 additions & 0 deletions files/readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
markItUp! 1.1.3

CHANGE LOG
markItUp! 1.1.3 2008-09-12
- Fixed: IE7 preview problem

markItUp! 1.1.2 2008-07-17
- Fixed: Quick fix for Opera 9.5 caret position problem after insertion

markItUp! 1.1.1 2008-06-02
- Fixed: Key events status are passed to callbacks properly
- Improved: ScrollPosition is kept in the preview when its refreshed

markItUp! 1.1.0 2008-05-04
- Modified: Textarea's id is no more moved to the main container
- Modified: NameSpace Span become a Div to remain strict
- Added: Relative path to the script is computed
- Added: Relative path to the script passed to callbacks
- Added: Global instance ID property
- Added: $(element).markItUpRemove() to remove markItUp!
- Added: Resize handle is now optional with resizeHandle property
- Added: Property previewInWindow is added and accept window parameter
- Added: Property previewPosition is added
- Modified: Resize handle is no more displayed in Safari to avoid repetition with the native handle
- Modified: Property previewIframeRefresh become previewAutorefresh
- Modified: Built-in Html Preview call a template file
- Improved: Autorefreshing is now apply for preview in window too
- Improved: Cancel button in prompt window cancel now the whole insertion process
- Improved: Cleaner markItUp! code added to the DOM
- Removed: Depreciated preview properties as previewBaseUrl, previewCharset, previewCssPath, previewBodyId, previewBodyClassName
- Removed: Property previewIframe not longer exists
- Fixed: "Magic markups" works with line feeds
- Fixed: Key events are initialized after insertion
- Fixed: Internet Explorer line feed offset bug
- Fixed: Shortcut keys on Mac OS
- Fixed: Ctrl+click works and doesn't open Mac context menu anymore
- Fixed: Ctrl+click works and doesn't open the page in a new tab anymore
- Fixed: Minor Css modifications

markItUp! 1.0.3 2008-04-04
- Fixed: IE7 Preview empty baseurl problem
- Fixed: IE7 external targeted insertion
- Added: Property scrollPosition is passed to callbacks functions

markItUp! 1.0.2 2008-03-31
- Fixed: IE7 Html preview problems
- Fixed: Selection is kept if nothing is inserted
- Improved: Code minified

markItUp! 1.0.1 2008-03-21
- Removed: Global PlaceHolder
- Modified: Property previewCharset is setted to "utf-8" by default

markItUp! 1.0.0 2008-03-01
- First public release
Binary file added files/sets/images/align-center.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added files/sets/images/align-justify.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added files/sets/images/align-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added files/sets/images/align-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added files/sets/images/blockquote.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified files/sets/images/image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified files/sets/images/link-media.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added files/sets/images/separator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added files/sets/images/video.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b4b3689

Please sign in to comment.