Update vendors.

Former-commit-id: 92fe8e8ceacd0993fadd35c5feffddcbe319d6c7
This commit is contained in:
John-David Dalton
2013-02-24 15:35:56 -08:00
parent 9b22748bd0
commit 7a853e2dcb
4 changed files with 38 additions and 30 deletions

View File

@@ -26,7 +26,7 @@
var closureId = '23cf67d0f0b979d97631fc108a2a43bb82225994'; var closureId = '23cf67d0f0b979d97631fc108a2a43bb82225994';
/** The Git object ID of `uglifyjs.tar.gz` */ /** The Git object ID of `uglifyjs.tar.gz` */
var uglifyId = 'a934fb18f8fa2768c6a68de44b6e035fe96a268b'; var uglifyId = 'e28c7df12b160865f9be9fd24ffda31b2d60b079';
/** The path of the directory that is the base of the repository */ /** The path of the directory that is the base of the repository */
var basePath = fs.realpathSync(path.join(__dirname, '..')); var basePath = fs.realpathSync(path.join(__dirname, '..'));

View File

@@ -584,10 +584,11 @@
// detect stubborn layout engines // detect stubborn layout engines
if (layout == 'iCab' && parseFloat(version) > 3) { if (layout == 'iCab' && parseFloat(version) > 3) {
layout = ['WebKit']; layout = ['WebKit'];
} else if (data = } else if ((data =
/Opera/.test(name) && 'Presto' || /Opera/.test(name) && 'Presto' ||
/\b(?:Midori|Nook|Safari)\b/i.test(ua) && 'WebKit' || /\b(?:Midori|Nook|Safari)\b/i.test(ua) && 'WebKit' ||
!layout && /\bMSIE\b/i.test(ua) && (/^Mac/.test(os) ? 'Tasman' : 'Trident')) { !layout && /\bMSIE\b/i.test(ua) && (/^Mac/.test(os) ? 'Tasman' : 'Trident')
)) {
layout = [data]; layout = [data];
} }
// leverage environment features // leverage environment features
@@ -629,12 +630,12 @@
} }
} }
// detect Adobe AIR // detect Adobe AIR
else if (getClassOf(data = window.runtime) == 'ScriptBridgingProxyObject') { else if (getClassOf((data = window.runtime)) == 'ScriptBridgingProxyObject') {
name = 'Adobe AIR'; name = 'Adobe AIR';
os = data.flash.system.Capabilities.os; os = data.flash.system.Capabilities.os;
} }
// detect PhantomJS // detect PhantomJS
else if (getClassOf(data = window.phantom) == 'RuntimeObject') { else if (getClassOf((data = window.phantom)) == 'RuntimeObject') {
name = 'PhantomJS'; name = 'PhantomJS';
version = (data = data.version || null) && (data.major + '.' + data.minor + '.' + data.patch); version = (data = data.version || null) && (data.major + '.' + data.minor + '.' + data.patch);
} }
@@ -654,9 +655,10 @@
} }
// detect prerelease phases // detect prerelease phases
if (version && (data = if (version && (data =
/(?:[ab]|dp|pre|[ab]\d+pre)(?:\d+\+?)?$/i.exec(version) || /(?:[ab]|dp|pre|[ab]\d+pre)(?:\d+\+?)?$/i.exec(version) ||
/(?:alpha|beta)(?: ?\d)?/i.exec(ua + ';' + (useFeatures && nav.appMinorVersion)) || /(?:alpha|beta)(?: ?\d)?/i.exec(ua + ';' + (useFeatures && nav.appMinorVersion)) ||
/\bMinefield\b/i.test(ua) && 'a')) { /\bMinefield\b/i.test(ua) && 'a'
)) {
prerelease = /b/i.test(data) ? 'beta' : 'alpha'; prerelease = /b/i.test(data) ? 'beta' : 'alpha';
version = version.replace(RegExp(data + '\\+?$'), '') + version = version.replace(RegExp(data + '\\+?$'), '') +
(prerelease == 'beta' ? beta : alpha) + (/\d+\+?/.exec(data) || ''); (prerelease == 'beta' ? beta : alpha) + (/\d+\+?/.exec(data) || '');
@@ -697,8 +699,9 @@
// detect BlackBerry OS version // detect BlackBerry OS version
// http://docs.blackberry.com/en/developers/deliverables/18169/HTTP_headers_sent_by_BB_Browser_1234911_11.jsp // http://docs.blackberry.com/en/developers/deliverables/18169/HTTP_headers_sent_by_BB_Browser_1234911_11.jsp
else if (/BlackBerry/.test(product) && (data = else if (/BlackBerry/.test(product) && (data =
(RegExp(product.replace(/ +/g, ' *') + '/([.\\d]+)', 'i').exec(ua) || 0)[1] || (RegExp(product.replace(/ +/g, ' *') + '/([.\\d]+)', 'i').exec(ua) || 0)[1] ||
version)) { version
)) {
os = 'Device Software ' + data; os = 'Device Software ' + data;
version = null; version = null;
} }
@@ -713,7 +716,7 @@
/Windows XP/.test(os) && version > 8 || /Windows XP/.test(os) && version > 8 ||
version == 8 && !/Trident/.test(ua) version == 8 && !/Trident/.test(ua)
)) ))
) && !reOpera.test(data = parse.call(forOwn, ua.replace(reOpera, '') + ';')) && data.name) { ) && !reOpera.test((data = parse.call(forOwn, ua.replace(reOpera, '') + ';'))) && data.name) {
// when "indentifying", the UA contains both Opera and the other browser's name // when "indentifying", the UA contains both Opera and the other browser's name
data = 'ing as ' + data.name + ((data = data.version) ? ' ' + data : ''); data = 'ing as ' + data.name + ((data = data.version) ? ' ' + data : '');
@@ -801,7 +804,7 @@
} }
} }
// strip incorrect OS versions // strip incorrect OS versions
if (version && version.indexOf(data = /[\d.]+$/.exec(os)) == 0 && if (version && version.indexOf((data = /[\d.]+$/.exec(os))) == 0 &&
ua.indexOf('/' + data + '-') > -1) { ua.indexOf('/' + data + '-') > -1) {
os = trim(os.replace(data, '')); os = trim(os.replace(data, ''));
} }

View File

@@ -1,4 +1,4 @@
# QUnit CLIB <sup>v1.2.0</sup> # QUnit CLIB <sup>v1.3.0</sup>
## command-line interface boilerplate ## command-line interface boilerplate
QUnit CLIB helps extend QUnit's CLI support to many common CLI environments. QUnit CLIB helps extend QUnit's CLI support to many common CLI environments.
@@ -9,26 +9,29 @@ QUnit CLIB helps extend QUnit's CLI support to many common CLI environments.
## Support ## Support
QUnit CLIB has been tested in at least Node.js 0.4.8-0.8.19, Narwhal v0.3.2, PhantomJS 1.8.1, RingoJS v0.9, and Rhino v1.7RC5. QUnit CLIB has been tested in at least Node.js 0.4.8-0.8.20, Narwhal 0.3.2, PhantomJS 1.8.1, RingoJS 0.9, and Rhino 1.7RC5.
## Usage ## Usage
```js ```js
(function(window) { ;(function(window) {
'use strict';
// use a single "load" function // use a single "load" function
var load = typeof require == 'function' ? require : window.load; var load = typeof require == 'function' ? require : window.load;
// load QUnit and CLIB if needed // load QUnit and CLIB if needed
var QUnit = var QUnit = (function() {
window.QUnit || ( var noop = Function.prototype;
window.addEventListener || (window.addEventListener = Function.prototype), return window.QUnit || (
window.setTimeout || (window.setTimeout = Function.prototype), window.addEventListener || (window.addEventListener = noop),
window.QUnit = load('path/to/qunit.js') || window.QUnit, window.setTimeout || (window.setTimeout = noop),
load('path/to/qunit-clib.js'), window.QUnit = load('../vendor/qunit/qunit/qunit.js') || window.QUnit,
window.addEventListener === Function.prototype && delete window.addEventListener, (load('../vendor/qunit-clib/qunit-clib.js') || { 'runInContext': noop }).runInContext(window),
addEventListener === noop && delete window.addEventListener,
window.QUnit window.QUnit
); );
}());
// explicitly call `QUnit.module()` instead of `module()` // explicitly call `QUnit.module()` instead of `module()`
// in case we are in a CLI environment // in case we are in a CLI environment
@@ -38,9 +41,8 @@ QUnit CLIB has been tested in at least Node.js 0.4.8-0.8.19, Narwhal v0.3.2, Pha
// ... // ...
}); });
// must call `QUnit.start()` if using QUnit < 1.3.0 with Node.js or any // call `QUnit.start()` for Narwhal, Node.js, PhantomJS, Rhino, and RingoJS
// version of QUnit with Narwhal, PhantomJS, Rhino, or RingoJS if (!window.document || window.phantom) {
if (!window.document) {
QUnit.start(); QUnit.start();
} }
}(typeof global == 'object' && global || this)); }(typeof global == 'object' && global || this));
@@ -49,7 +51,6 @@ QUnit CLIB has been tested in at least Node.js 0.4.8-0.8.19, Narwhal v0.3.2, Pha
## Footnotes ## Footnotes
1. QUnit v1.3.0 does not work with Narwhal or Ringo < v0.8.0 1. QUnit v1.3.0 does not work with Narwhal or Ringo < v0.8.0
2. Rhino v1.7RC4 does not support timeout fallbacks `clearTimeout` and `setTimeout` 2. Rhino v1.7RC4 does not support timeout fallbacks `clearTimeout` and `setTimeout`
## Author ## Author

View File

@@ -19,12 +19,16 @@
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
/** /**
* Installs the CLI boilerplate additions on the `context` object. * Installs the CLI boilerplate additions on the given `context` object.
* *
* @private * @memberOf exports
* @param {Object} context The context object. * @param {Object} context The context object.
*/ */
function runInContext(context) { function runInContext(context) {
// exit early if no `context` is provided or if `QUnit` does not exist
if (!context || !context.QUnit) {
return;
}
/** /**
* Schedules timer-based callbacks. * Schedules timer-based callbacks.