409 Commits

Author SHA1 Message Date
Christopher Jeffrey
3ad276bcc5 Revert "fix html comments. fixes #381 and #389."
This reverts commit 288a6478e229ceead86a5587782bc5d16885d0e5.
2014-04-26 07:35:47 -05:00
Christopher Jeffrey
288a6478e2 fix html comments. fixes #381 and #389. 2014-04-26 07:29:31 -05:00
Christopher Jeffrey
dc3b344e82 pass error to callback on highlight error. fixes #377. 2014-03-27 06:35:04 -05:00
Christopher Jeffrey
7bdaa54c51 Revert "set token.escaped properly for sync highlighting. see #375."
This reverts commit a7ab0f408e0f5645dd5bc6c308895a90dca54274.
2014-03-26 14:26:17 -05:00
Christopher Jeffrey
6b60db3457 clean up new module check
- custom setup of RequireJS provides 'exports' variable without 'module'
  function loadExtension @
  https://github.com/adobe/brackets/blob/master/src/utils/ExtensionLoader.js
2014-03-26 13:02:45 -05:00
Christopher Jeffrey
a7ab0f408e set token.escaped properly for sync highlighting. see #375. 2014-03-26 13:01:58 -05:00
Martin Zagora
b422126696 Fixed issue when using custom RequireJS loader 2014-03-25 15:50:19 +11:00
Christopher Jeffrey
0e6e780f11 comment. 2014-03-10 00:59:52 -05:00
Christopher Jeffrey
ea37585b9a Revert "rough implementation of task lists. see #107 #111."
This reverts commit 26cef98d7261cb8330c07eceff250254124f20d8.
2014-03-10 00:59:32 -05:00
Christopher Jeffrey
b5b4683179 Revert "use renderer for task lists. see #107 #111."
This reverts commit a5e39a6a59a91a7c8fa88e9113ba4dde7264e33b.
2014-03-10 00:59:17 -05:00
Christopher Jeffrey
a5e39a6a59 use renderer for task lists. see #107 #111. 2014-02-25 23:55:24 -06:00
Christopher Jeffrey
26cef98d72 rough implementation of task lists. see #107 #111. 2014-02-25 23:52:11 -06:00
Christopher Jeffrey
bcf206e6d7 fix double gfm autolinks. fixes #56. 2014-02-23 07:17:43 -06:00
Christopher Jeffrey
05a740cf6c fix regression caused by merge conflict. 2014-02-23 06:18:28 -06:00
Christopher Jeffrey
e6082a0f6a Merge branch 'def_hr_fixes'
Conflicts:
	lib/marked.js
2014-02-20 19:58:30 -06:00
Christopher Jeffrey
49006dd949 implement xhtml option for self-closing elements. fixes #330. 2014-02-11 15:26:45 -06:00
Christopher Jeffrey
613bf6ac63 ensure javascript: protocols are not encoded in entities and references. 2014-01-10 01:46:05 -06:00
Christopher Jeffrey
cd507dd55a rely on options passed to the renderer object. 2014-01-10 01:07:45 -06:00
Christopher Jeffrey
5e716661fe completely escape fenced code. 2014-01-10 01:07:45 -06:00
Christopher Jeffrey
904c71b771 sanitize javascript: links. 2014-01-10 01:07:45 -06:00
Christopher Jeffrey
32714af056 escape lang class. 2014-01-10 01:07:45 -06:00
Christopher Jeffrey
96f1f35628 do not tokenize emails as html. fixes #329 again. 2014-01-10 01:07:45 -06:00
Christopher Jeffrey
0e1ac14bc5 do not tokenize emails as html. fixes #329. 2014-01-10 01:07:45 -06:00
Christopher Jeffrey
b9b941ebea Revert "see #302. remove all obsolete features. keep things easy to revert."
This reverts commit f9c90b0cdb15d6a3ef087b79364b979fb8ef81bb.

Revert "Fix test cases. Since we have removed the headerPrefix option. There"

This reverts commit 509b284c7cc09232562c89a91453797ab88fd73f.
2013-12-23 08:00:35 -06:00
Christopher Jeffrey
e0489a5b8b minor refactor. remove useless args. 2013-12-05 17:07:16 -06:00
Christopher Jeffrey
f9c90b0cdb see #302. remove all obsolete features. keep things easy to revert. 2013-12-04 06:25:16 -06:00
Christopher Jeffrey
bc1f59a950 enable all obsolete features. 2013-12-04 06:18:26 -06:00
Christopher Jeffrey
e9ed4aa9d7 more disabling of obsolete features. 2013-12-04 06:13:52 -06:00
Christopher Jeffrey
98d413fdbd add heading ids once more. comment obsolete features. 2013-12-04 06:06:11 -06:00
Christopher Jeffrey
e3692c772b temporarily reimplement highlight and langPrefix. 2013-12-04 05:57:18 -06:00
Christopher Jeffrey
22f6314c9b remove needless assignment. 2013-12-04 05:37:37 -06:00
Christopher Jeffrey
b0941b9151 call paragraph renderer for stray text tokens. 2013-12-04 05:35:30 -06:00
Christopher Jeffrey
8e51a68125 misc style concerns. 2013-12-04 05:32:35 -06:00
Christopher Jeffrey
72b8233d29 make renderer method names more consistent with rule names. 2013-12-04 05:24:38 -06:00
Christopher Jeffrey
2636f85ab3 stop reinstantiating a renderer every call. 2013-12-04 05:16:29 -06:00
Christopher Jeffrey
d116575469 remove headerPrefix. 2013-12-04 05:12:30 -06:00
Christopher Jeffrey
76ac4da89f reimplement async highlighting feature. whitespace. 2013-12-04 05:07:43 -06:00
Christopher Jeffrey
2d5090b1de Merge remote-tracking branch 'lepture/feature-renderer'
Conflicts:
	README.md
	lib/marked.js
2013-12-04 04:57:30 -06:00
Hsiaoming Yang
5fa0a3fb90 Fix table align. Marked use style text-align instead of the align
attribute.
2013-12-04 14:12:27 +08:00
Hsiaoming Yang
73f5e0afbe Add renderer feature. This is a updated version of #129.
At #129, it only contains block level renderers. This patch contains
both block level and span level renderers.
Since renderer feature can do many things, I removed highlight option
and headerPrefix option.

https://github.com/chjj/marked/pull/129
2013-12-04 14:05:57 +08:00
Christopher Jeffrey
2a0b794c2d fix header renderer. 2013-12-03 23:12:57 -06:00
Christopher Jeffrey
7eed150966 Merge remote-tracking branch 'lepture/renderer' 2013-12-03 23:09:03 -06:00
Christopher Jeffrey
ab84e8c605 add headerPrefix option. fixes #272. misc readme fixes. 2013-11-02 18:26:20 -05:00
Christopher Jeffrey
84a9be252d minor. 2013-08-24 19:10:18 -05:00
Christopher Jeffrey
aba62d01d6 style: do not violate 80 col limit. no double quotes. 2013-08-08 11:29:26 -05:00
Christopher Jeffrey
f74978c3cd another charAt. minor space consistency changes. 2013-08-08 10:03:52 -05:00
Christopher Jeffrey
ab2b953ea9 use charAt. fixes #192. 2013-08-08 04:25:12 -05:00
Christopher Jeffrey
d53f20690f fix nested links+img. 2013-08-07 10:42:55 -05:00
Christopher Jeffrey
37698ee7e0 list-like lines = lists in gfm. fixes #120. 2013-08-07 08:52:01 -05:00
John Long
09e83d52ba Switch from th/td attribute 'align' to style attribute 'text-align' for aligning 2013-08-06 14:51:33 -05:00