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.

Sign up for GitHub

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

Jump to bottom

TIMOB-7458 Addendum to previous fix: include support for pseudo-type nam... #1995

Merged
merged 3 commits into from
Apr 13, 2012
Merged

TIMOB-7458 Addendum to previous fix: include support for pseudo-type nam... #1995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4414c67
TIMOB-7458 Addendum to previous fix: include support for pseudo-type …
billdawson Apr 12, 2012
703fc0a
Merge branch 'appc_master' into timob-7458
billdawson Apr 13, 2012
418daed
Merge branch 'appc_master' into timob-7458
billdawson Apr 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion apidoc/Titanium/Media/Media.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ since: "1.8"
properties:
- name: value
summary: The value for the given predicate. See the descriptions
in <Titanium.Media.MediaQueryType> for information about which properties
in <MediaQueryType> for information about which properties
require which values.
type: [Number, String, Boolean]
- name: exact
Expand Down
8 changes: 5 additions & 3 deletions apidoc/generators/jsca_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@ def markdown_to_html(s):
html = markdown(s)
# Any <Titanium.XX.XX> type of markdown links need to have their brackets removed so
# the code assist doesn't see them as tags and thus strip them, thereby losing the
# useful text within.
pattern = r"\<Titanium[^\>\s]*\>"
# useful text within. Same for known pseudo-types.
pattern = r"\<[^\>\s]+\>"
matches = re.findall(pattern, html)
if matches:
for m in matches:
html = html.replace(m, m[1:-1])
tag_name = m[1:-1]
if tag_name.startswith("Titanium") or tag_name in all_annotated_apis:
html = html.replace(m, tag_name)
return html

# Fixes illegal names like "2DMatrix" (not valid Javascript name)
Expand Down