Skip to content

Commit 84df197

Browse files
committed
Remove adobe air tests, update qunit-extras and docdown.
1 parent 5ef230a commit 84df197

File tree

15 files changed

+626
-504
lines changed

15 files changed

+626
-504
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Platform.js has been tested in at least Chrome 5~29, Firefox 2~24, IE 6-10, Oper
2222

2323
## Installation and usage
2424

25-
In a browser or Adobe AIR:
25+
In a browser:
2626

2727
```html
2828
<script src="platform.js"></script>

test/platform.air/.actionScriptProperties

Lines changed: 0 additions & 25 deletions
This file was deleted.

test/platform.air/.flexProperties

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/platform.air/.project

Lines changed: 0 additions & 24 deletions
This file was deleted.

test/platform.air/README.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

test/platform.air/bin-debug/air.swf

-947 KB
Binary file not shown.

test/platform.air/src/air-app.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/platform.air/src/air.mxml

Lines changed: 0 additions & 7 deletions
This file was deleted.

test/platform.air/src/index.html

Lines changed: 0 additions & 27 deletions
This file was deleted.

test/test.js

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
root.addEventListener || (root.addEventListener = noop),
1212
root.setTimeout || (root.setTimeout = noop),
1313
root.QUnit = load('../vendor/qunit/qunit/qunit.js') || root.QUnit,
14-
(load('../vendor/qunit-clib/qunit-clib.js') || { 'runInContext': noop }).runInContext(root),
14+
(load('../vendor/qunit-extras/qunit-extras.js') || { 'runInContext': noop }).runInContext(root),
1515
addEventListener === noop && delete root.addEventListener,
1616
root.QUnit
1717
);
@@ -431,6 +431,15 @@
431431
'version': '27.0.1453.90',
432432
},
433433

434+
'Chrome Mobile 1.0 on Samsung (Android 4.2.2)': {
435+
'ua' : 'Mozilla/5.0 (Linux; Android 4.2.2; en-au; SAMSUNG GT-I9500 Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Version/1.0 Chrome/18.0.1025.308 Mobie Safari/535.19',
436+
'layout': 'WebKit',
437+
'manufacturer': 'Samsung',
438+
'name': 'Chrome Mobile',
439+
'os': '',
440+
'product': ''
441+
},
442+
434443
'Chrome Mobile (desktop mode) on iOS 4.3+': {
435444
'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/534.53.11 (KHTML, like Gecko) Version/5.1.3 Safari/534.53.10',
436445
'layout': 'WebKit',
@@ -466,7 +475,7 @@
466475

467476
'Firefox 2.0.0.7 on Gentoo': {
468477
'ua': 'Mozilla/5.0 (X11; U; Linux Gentoo; pl-PL; rv:1.8.1.7) Gecko/20070914 Firefox/2.0.0.7',
469-
'layout': 'Gecko',
478+
'layout': 'Gecko',
470479
'name': 'Firefox',
471480
'os': 'Gentoo',
472481
'version': '2.0.0.7'
@@ -483,15 +492,15 @@
483492

484493
'Firefox 3.0 on Debian 64-bit': {
485494
'ua': 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9) Gecko/2008062908 Firefox/3.0 (Debian-3.0~rc2-2)',
486-
'layout': 'Gecko',
495+
'layout': 'Gecko',
487496
'name': 'Firefox',
488497
'os': 'Debian 64-bit',
489498
'version': '3.0'
490499
},
491500

492501
'Firefox 3.0 on SuSE': {
493502
'ua': 'Mozilla/5.0 (X11; U; Linux i686; tr-TR; rv:1.9.0) Gecko/2008061600 SUSE/3.0-1.2 Firefox/3.0',
494-
'layout': 'Gecko',
503+
'layout': 'Gecko',
495504
'name': 'Firefox',
496505
'os': 'SuSE',
497506
'version': '3.0'
@@ -524,7 +533,7 @@
524533

525534
'Firefox 3.6.7 on CentOS': {
526535
'ua': 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.7) Gecko/20100726 CentOS/3.6-3.el5.centos Firefox/3.6.7',
527-
'layout': 'Gecko',
536+
'layout': 'Gecko',
528537
'name': 'Firefox',
529538
'os': 'CentOS',
530539
'version': '3.6.7'
@@ -540,7 +549,7 @@
540549

541550
'Firefox 3.6.20 on Red Hat 64-bit': {
542551
'ua': 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.20) Gecko/20110804 Red Hat/3.6-2.el5 Firefox/3.6.20',
543-
'layout': 'Gecko',
552+
'layout': 'Gecko',
544553
'name': 'Firefox',
545554
'os': 'Red Hat 64-bit',
546555
'version': '3.6.20'
@@ -592,6 +601,22 @@
592601
'version': '5.0'
593602
},
594603

604+
'Firefox Mobile 18.0 on Firefox OS': {
605+
'ua': 'Mozilla/5.0 (Mobile; rv:18.0) Gecko/18.0 Firefox/18.0',
606+
'layout': 'Gecko',
607+
'name': 'Firefox Mobile',
608+
'os': 'Firefox OS',
609+
'version': '18.0'
610+
},
611+
612+
'Firefox Mobile 24.0 on Android': {
613+
'ua': 'Mozilla/5.0 (Android; Mobile; rv:24.0) Gecko/24.0 Firefox/24.0',
614+
'layout': 'Gecko',
615+
'name': 'Firefox Mobile',
616+
'os': 'Android',
617+
'version': '24.0'
618+
},
619+
595620
'Firefox Mobile 2.0#{beta}1 on Android': {
596621
'ua': 'Mozilla/5.0 (Android; Linux armv7l; rv:2.0b6pre) Gecko/20100907 Firefox/4.0b6pre Fennec/2.0b1pre',
597622
'layout': 'Gecko',

vendor/docdown/src/DocDown/MarkdownGenerator.php

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,18 @@ function sortCompare($a, $b) {
516516
);
517517
// add entries
518518
foreach ($entries as $entry) {
519-
$result[] = MarkdownGenerator::interpolate('* [`#{member}#{separator}#{name}`](##{hash})', $entry);
519+
if ($entry->isAlias()) {
520+
$result[] = MarkdownGenerator::interpolate('* <a href="##{hash}" class="alias">`#{member}#{separator}#{name}` -> `#{realName}`</a>', array(
521+
'hash' => $entry->hash,
522+
'member' => $entry->member,
523+
'name' => $entry->getName(),
524+
'realName' => $entry->owner->getName(),
525+
'separator' => $entry->separator
526+
));
527+
}
528+
else {
529+
$result[] = MarkdownGenerator::interpolate('* <a href="##{hash}">`#{member}#{separator}#{name}`</a>', $entry);
530+
}
520531
}
521532
}
522533
}
@@ -553,7 +564,18 @@ function sortCompare($a, $b) {
553564
}
554565
foreach ($entry->{$kind} as $subentry) {
555566
$subentry->member = $member;
556-
$result[] = MarkdownGenerator::interpolate('* [`#{member}#{separator}#{name}`](##{hash})', $subentry);
567+
if ($subentry->isAlias()) {
568+
$result[] = MarkdownGenerator::interpolate('* <a href="##{hash}" class="alias">`#{member}#{separator}#{name}` -> `#{realName}`</a>', array(
569+
'hash' => $subentry->hash,
570+
'member' => $subentry->member,
571+
'name' => $subentry->getName(),
572+
'realName' => $subentry->owner->getName(),
573+
'separator' => $subentry->separator
574+
));
575+
}
576+
else {
577+
$result[] = MarkdownGenerator::interpolate('* <a href="##{hash}">`#{member}#{separator}#{name}`</a>', $subentry);
578+
}
557579
}
558580
}
559581
}

0 commit comments

Comments
 (0)