Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Incorrectly works "Bold" at android #31

Open
wants to merge 79 commits into
base: indent
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
c99817b
Added jQuery 1.5 link
jaysalvat Feb 23, 2011
157249d
Added quotes to jQuery attribute selectors
jaysalvat Feb 23, 2011
93b517c
Modified Changelog
jaysalvat Feb 23, 2011
f60743d
Updated to jQuery 1.5.1
Mar 24, 2011
ce474f1
Tried to fix the endless IE caret position bug
Mar 24, 2011
8f464f1
Added metakey support for Mac users (michal-krause)
Mar 24, 2011
318ee89
Typo fix
alevchuk Apr 17, 2011
0cd479b
Multiline support for code, quotations, and lists
alevchuk Apr 17, 2011
5f0a5a0
Added the 'multiline:true' propertie support
jaysalvat Apr 21, 2011
c4a8c6e
Added metakey support for Mac users (michal-krause)
Mar 24, 2011
d19455e
Added the 'multiline:true' propertie support
jaysalvat Apr 21, 2011
05163d6
Switched mouseup to mousedown event to solve Ctrl key problem on Webkit
jaysalvat Apr 25, 2011
47e4225
Merge and tweak multiline support from alevchuk
jaysalvat Apr 25, 2011
b8f02d4
Fixed multiline with IE \r
jaysalvat Apr 25, 2011
c3c7350
Excluded empty lines on multiline insertion
jaysalvat Apr 25, 2011
39bb426
Merge branch 'master' of github.com:markitup/1.x
jaysalvat Apr 25, 2011
b889a32
Updated the demo with jQuery 1.5.2
jaysalvat Apr 25, 2011
dc6e969
Updated the Changelog
jaysalvat Apr 25, 2011
ed52a89
enable parsing the markup in javascript
amroth Jul 18, 2011
c9b63a2
Merge pull request #5 from amroth/master
jaysalvat Jul 19, 2011
f614f3e
Update to jQuery 1.6.2
Jul 19, 2011
636fe32
Update Changelog
Jul 19, 2011
ca688f9
Fix the bug where no tag were inserted on a empty selection
Aug 11, 2011
f6041b8
Better trailing space management on insertion
Aug 11, 2011
979af07
Updated Changelog
Aug 11, 2011
328291e
Multiline is fixed.
Aug 16, 2011
f9d9768
Updated events to use namespace
JoyceBabu May 29, 2012
02e669c
Merge pull request #8 from JoyceBabu/master
jaysalvat May 29, 2012
995efcf
Added the previewHandler option to allow complete control over preview
lecterror Jun 19, 2012
12e4145
Merge pull request #9 from lecterror/master
jaysalvat Jun 19, 2012
cf8a47f
Fixed Ctrl+Enter syntax error
Aug 3, 2012
84c70d6
Merge pull request #15 from UltCombo/master
jaysalvat Aug 3, 2012
6725d74
Change mode
jaysalvat Aug 30, 2012
dd4d91c
Merge branch 'master' of github.com:markitup/1.x
jaysalvat Aug 30, 2012
9f2a51a
Add package.json
jaysalvat Aug 30, 2012
a439ef9
Add jQuery 1.8 to the demo
jaysalvat Aug 30, 2012
179289e
Rewrite the demo page HTML5 oriented
jaysalvat Aug 30, 2012
2a18bb6
Change comment date
jaysalvat Aug 30, 2012
8caad82
Added some line to Changelog.md
jaysalvat Aug 30, 2012
7800895
Added ability to render preview in a DOM element
jaysalvat Aug 30, 2012
1a209ed
Minor HTML changes
jaysalvat Aug 30, 2012
98a170f
Added the syntax $(elm).markItUp('insert', { }); and $(elm).markItUp(…
jaysalvat Aug 30, 2012
7594f3e
Fixed typo
jaysalvat Aug 30, 2012
aca586e
Click on menu bubbles up so it could be reused
Sep 9, 2012
cbdbaca
Fixed default (placeHolder) selection after using a tag having either…
Jan 4, 2013
7bb01a2
Merge pull request #19 from michilehr/master
jaysalvat Jan 29, 2013
21d7442
Merge pull request #20 from r3c/master
jaysalvat Jan 29, 2013
bae7bdd
Add quick patch to keep compatibility with jQuery 1.9+
jaysalvat Jan 29, 2013
08cf5c4
Update changelog for release 1.1.14
jaysalvat Feb 4, 2013
5d008ae
make markItUpRemove function idempotent
alexey-sveshnikov Jul 11, 2013
5034579
Code formating
jaysalvat Jul 12, 2013
61a54f5
Adding More Customization
vralle Sep 26, 2013
19069af
Merge pull request #24 from vralle/master
jaysalvat Sep 26, 2013
f8c1405
Add option previewParserAjaxType
rhelms Oct 8, 2013
dcce656
Merge pull request #25 from rhelms/master
jaysalvat Oct 10, 2013
df32c49
Adding bower.json
kaiwa Oct 30, 2013
58c85da
Pass mouse up event to custom delegate with event object
ambroisemaupate Mar 18, 2014
05db57c
Added uglified jquery.markitup.min.js
ambroisemaupate Mar 18, 2014
d248487
Pass mouse up event to custom delegate with event object (rezozero)
jaysalvat Mar 20, 2014
c014800
Never use empty href in links #27 (ambroisemaupate)
jaysalvat Jun 2, 2014
e7e093d
Merge pull request #28 from kaiwa/master
jaysalvat Dec 31, 2014
c14c2a3
Add dependencies to bower.json
jaysalvat Dec 31, 2014
d504809
Mark as compatible with jQuery 2.x in bower.json
liviucmg Jan 22, 2015
2c88c42
Merge pull request #29 from WeCodePixels/master
jaysalvat Jan 23, 2015
c33f837
previewParser can now be used in conjunction with previewHandler,
Feb 7, 2015
d148aaf
Merge pull request #30 from brezelman/master
jaysalvat Feb 9, 2015
ba7aae2
Update package.json
xorock Oct 27, 2015
6b77d53
Merge pull request #33 from xorock/master
jaysalvat Oct 28, 2015
0296d45
Support jquery 3
dereuromark Jan 21, 2018
945bcca
Merge pull request #34 from dereuromark/patch-1
jaysalvat Jan 22, 2018
6a4f0fb
Add missing "var" to avoid global namespace pollution.
Aug 11, 2018
1390d6c
Merge pull request #35 from r3c/master
jaysalvat Aug 14, 2018
e147ca3
Create MIT-LICENSE
jaysalvat Aug 16, 2018
1739f6c
Fix Bower invalid-meta
stonio Aug 18, 2018
ba14e42
Merge pull request #36 from stonio/patch-1
jaysalvat Aug 18, 2018
4370e90
Updated CHANGELOG.md to "Keep a Changelog" format
Art4 Aug 21, 2018
91793b3
Merge pull request #37 from Art4/patch-1
jaysalvat Aug 21, 2018
51f424f
Trigger an input event after inserting markup.
Oct 19, 2018
77b48ad
Merge pull request #38 from DuaelFr/f-input-event
jaysalvat Oct 22, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
233 changes: 206 additions & 27 deletions CHANGELOG.md
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,70 +1,212 @@
markItUp! 1.1.9
# Changelog
All notable changes to **markItUp!** will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

## [Unreleased]

### Changed

- Changelog is now based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

### Fixed

- Fixed invalid meta in bower.json

## [1.1.15] - 2018-08-16

### Added

- Allow Custom tags to button name
- Added HTTP method config for AJAX preview request
- Added support for jQuery 2 and 3
- Added MIT license
- Added bower.json

### Changed

- markItUpRemove function is now idempotent

### Fixed

- avoid global namespace pollution
- Never use empty href in links

## [1.1.14] - 2013-02-04

### Changed

- Compatibility patch for jQuery 1.9+
- Click on menu bubbles up so it could be reused (michilehr)

### Fixed

- Fixed default selection after using a tag having either openBlockWith or closeBlockWith (r3c)

## [1.1.13] - 2012-08-30

### Added

- Added ability to render preview in a DOM element (ytjohn & jaysalvat)
- Added the previewHandler option to allow complete control over preview (lecterror)
- Added `$(elm).markItUp('insert', { })` and `$(elm).markItUp('remove');`
- Added package.json

### Changed

- Updated events to use namespace (JoyceBabu)
- Updated the demo

### Fixed

- Fixed Ctrl+Enter syntax error (UltCombo)

## [1.1.12] - 2011-08-11

### Changed

- Enhanced the trailing space management

### Fixed

- Fixed the insertion on empty selection

## [1.1.11] - 2011-07-19

### Added

- Enabled parsing the markup in javascript (amroth)
- Added multiline support (alevchuk)
- Added quotes to attribute selectors
- Added metakey support for Mac users (michal-krause)

### Changed

- Updated with jQuery 1.6.2

### Fixed

- Tried to fix the endless IE caret position bug

## [1.1.10] - 2011-02-20

### Changed

CHANGE LOG
markItUp! 1.1.10 2011-02-20
- Improved: Ajax property 'dataType' set to 'text'
- Improved: Ajax property 'global' set to 'false'

### Fixed

- Fixed: Ctrl+click selection problem

markItUp! 1.1.9 2010-11-04
## [1.1.9] - 2010-11-04

### Changed

- Improved: Selection accuracy in Internet Explorer
- Improved: Replace focusin() by bind('focusin') to solve some backward compatibility issues (Nick B. C.)
- Cosmetic: Add new logo
- Cosmetic: Remove jQuery library and use CDN

markItUp! 1.1.8 2010-08-27
## [1.1.8] - 2010-08-27

### Changed

- Improved: Some skin PNG have been optimized (lukescammell)
- Fixed: Opera 10 selection bug (Marius G.)
- Fixed: Accessibility issue with the background default color in the default skin
- Improved: Avoid giving the preview focus each time autorefresh kicks in. It still gets the focus when the preview button is pressed (DrSlump)
- Improved: In pop-up mode the preview is closed when the page containing the editor is unloaded (DrSlump)
- Improved: Press TAB jump right inside the textarea (Yakir)

markItUp! 1.1.7 2010-04-06
### Fixed

- Fixed: Opera 10 selection bug (Marius G.)
- Fixed: Accessibility issue with the background default color in the default skin

## [1.1.7] - 2010-04-06

### Fixed

- Fixed: Empty lines are removed at insertion on Webkit
- Fixed: Focus lost when shortcut is used on FF
- Fixed: var missing before $$ in markItUpRemove()

markItUp! 1.1.6 2010-01-12
## 1.1.6.1 - 2010-03-02

### Added

- Git is used for versioning and tagging

## 1.1.6 - 2010-01-12

### Changed

- Improved: Ajax requests are now asynchronous

### Fixed

- Fixed: Double empty line problem with preview and parsers
- Fixed: IE8 now close the preview properly

markItUp! 1.1.5 2009-05-01
## 1.1.5 - 2009-05-01

### Changed

- Modified: http://drupal.org/project/wysiwyg compatibility
- Modified: Alt/Ctrl/Alt+Tab are now disabled

markItUp! 1.1.4 2008-12-03
## 1.1.4 - 2008-12-03

### Fixed

- Fixed: Extra quote deleted line 95

markItUp! 1.1.3 2008-09-12
## 1.1.3 - 2008-09-12

### Fixed

- Fixed: IE7 preview problem

markItUp! 1.1.2 2008-07-17
## 1.1.2 - 2008-07-17

### Fixed

- 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
## 1.1.1 - 2008-06-02

### Changed

- 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
### Fixed

- Fixed: Key events status are passed to callbacks properly

## 1.1.0 - 2008-05-04

### Added

- 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

### Changed

- Modified: Textarea's id is no more moved to the main container
- Modified: NameSpace Span become a Div to remain strict
- 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

- Fixed: "Magic markups" works with line feeds
- Fixed: Key events are initialized after insertion
- Fixed: Internet Explorer line feed offset bug
Expand All @@ -73,19 +215,56 @@ markItUp! 1.1.0 2008-05-04
- 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
### Removed

- Removed: Depreciated preview properties as previewBaseUrl, previewCharset, previewCssPath, previewBodyId, previewBodyClassName
- Removed: Property previewIframe not longer exists

## 1.0.3 - 2008-04-04

### Added

- Added: Property scrollPosition is passed to callbacks functions

### Fixed

- 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
## 1.0.2 - 2008-03-31

### Changed

- Improved: Code minified

### Fixed

- 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
## 1.0.1 - 2008-03-21

### Changed

- Modified: Property previewCharset is setted to "utf-8" by default

markItUp! 1.0.0 2008-03-01
### Removed

- Removed: Global PlaceHolder

## 1.0.0 - 2008-03-01

### Added

- First public release

[Unreleased]: https://github.com/markitup/1.x/compare/1.1.15...HEAD
[1.1.15]: https://github.com/markitup/1.x/compare/1.1.14...1.1.15
[1.1.14]: https://github.com/markitup/1.x/compare/1.1.13...1.1.14
[1.1.13]: https://github.com/markitup/1.x/compare/1.1.12...1.1.13
[1.1.12]: https://github.com/markitup/1.x/compare/1.1.11...1.1.12
[1.1.11]: https://github.com/markitup/1.x/compare/1.1.10...1.1.11
[1.1.10]: https://github.com/markitup/1.x/compare/1.1.9...1.1.10
[1.1.9]: https://github.com/markitup/1.x/compare/1.1.8...1.1.9
[1.1.8]: https://github.com/markitup/1.x/compare/1.1.7...1.1.8
[1.1.7]: https://github.com/markitup/1.x/compare/1.1.6.1...1.1.7
20 changes: 20 additions & 0 deletions MIT-LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
MIT License

Copyright (c) <year> <copyright holders>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Empty file modified README.md
100644 → 100755
Empty file.
16 changes: 16 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "markitup",
"version": "1.1.15",
"main": [ "markitup/jquery.markitup.js" ],
"ignore": [
"markitup/templates/*",
"node_modules",
"bower_components",
"test",
"tests",
"vendor"
],
"dependencies": {
"jquery": ">=1.4.2"
}
}
Empty file modified images/body.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/jaysalvat.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/markitup.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/style.css
100644 → 100755
Empty file.
Loading