Update vendors and docs. [ci skip]

Former-commit-id: 9ca377423f4714fdf0e3fa428711e8dfe75e2e44
This commit is contained in:
John-David Dalton
2012-12-16 21:40:29 -08:00
parent a45499cf04
commit 04a568ac9b
3 changed files with 30 additions and 6 deletions

View File

@@ -25,6 +25,9 @@
/** Detect free variable `require` */
var freeRequire = typeof require == 'function' && require;
/** Used to store the `Object` built-in in case it's overwritten later */
var Object = window.Object;
/** Used to crawl all properties regardless of enumerability */
var getAllKeys = Object.getOwnPropertyNames;

View File

@@ -187,7 +187,10 @@ class Entry {
preg_match('#/\*\*(?:\s*\*)?([\s\S]*?)(?=\*\s\@[a-z]|\*/)#', $this->entry, $result);
if (count($result)) {
$type = $this->getType();
$result = trim(preg_replace('/(?:^|\n)\s*\* ?/', ' ', $result[1]));
$result = preg_replace('/:\n *\* */', ":<br>\n", $result[1]);
$result = preg_replace('/(?:^|\n) *\*\n *\* */', "\n\n", $result);
$result = preg_replace('/(?:^|\n) *\* ?/', ' ', $result);
$result = trim($result);
$result = ($type == 'Function' ? '' : '(' . str_replace('|', ', ', trim($type, '{}')) . '): ') . $result;
}
$this->_desc = $result;