Update deps.

This commit is contained in:
John-David Dalton
2014-08-26 23:55:39 -07:00
parent c4a7f899db
commit baee6b9738
17 changed files with 1206 additions and 995 deletions

2
vendor/dojo/LICENSE vendored
View File

@@ -13,7 +13,7 @@ The text of the AFL and BSD licenses is reproduced below.
The "New" BSD License:
**********************
Copyright (c) 2005-2013, The Dojo Foundation
Copyright (c) 2005-2014, The Dojo Foundation
All rights reserved.
Redistribution and use in source and binary forms, with or without

39
vendor/dojo/dojo.js vendored
View File

@@ -168,6 +168,36 @@
rhinoDojoConfig(defaultConfig, baseUrl, rhinoArgs);
}
has.add("host-webworker", ((typeof WorkerGlobalScope !== 'undefined') && (self instanceof WorkerGlobalScope)));
if(has("host-webworker")){
mix(defaultConfig.hasCache, {
"host-browser": 0,
"dom": 0,
"dojo-dom-ready-api": 0,
"dojo-sniff": 0,
"dojo-inject-api": 1,
"host-webworker": 1
});
defaultConfig.loaderPatch = {
injectUrl: function(url, callback){
// TODO:
// This is not async, nor can it be in Webworkers. It could be made better by passing
// the entire require array into importScripts at. This way the scripts are loaded in
// async mode; even if the callbacks are ran in sync. It is not a major issue as webworkers
// tend to be long running where initial startup is not a major factor.
try{
importScripts(url);
callback();
}catch(e){
console.info("failed to load resource (" + url + ")");
console.error(e);
}
}
};
}
// userConfig has tests override defaultConfig has tests; do this after the environment detection because
// the environment detection usually sets some has feature values in the hasCache.
for(var p in userConfig.has){
@@ -237,7 +267,7 @@
};
};
if(has("dom")){
if(has("dom") || has("host-webworker")){
// in legacy sync mode, the loader needs a minimal XHR library
var locationProtocol = location.protocol,
@@ -579,7 +609,7 @@
// for each packagePath found in any packagePaths config item, augment the packageConfig
// packagePaths is deprecated; remove in 2.0
for(baseUrl in config.packagePaths){
for(var baseUrl in config.packagePaths){
forEach(config.packagePaths[baseUrl], function(packageInfo){
var location = baseUrl + "/" + packageInfo;
if(isString(packageInfo)){
@@ -1294,7 +1324,7 @@
has.add("dojo-loader-eval-hint-url", 1);
}
var fixupUrl= function(url){
var fixupUrl= typeof userConfig.fixupUrl == "function" ? userConfig.fixupUrl : function(url){
url += ""; // make sure url is a Javascript string (some paths may be a Java string)
return url + (cacheBust ? ((/\?/.test(url) ? "&" : "?") + cacheBust) : "");
},
@@ -1606,7 +1636,7 @@
startTimer = function(){
clearTimer();
if(req.waitms){
timerId = window.setTimeout(function(){
timerId = global.setTimeout(function(){
clearTimer();
signal(error, makeError("timeout", waiting));
}, req.waitms);
@@ -1953,7 +1983,6 @@
"dojo-sync-loader":1,
"dojo-test-sniff":1,
"config-deferredInstrumentation":1,
"config-useDeferredInstrumentation":"report-unhandled-rejections",
"config-tlmSiblingOfDojo":1
},
packages:[{