diff options
| author | Anders Kaseorg <[email protected]> | 2017-01-20 12:29:59 -0500 |
|---|---|---|
| committer | Anders Kaseorg <[email protected]> | 2017-01-21 13:22:14 -0500 |
| commit | 6887a0f57307820b097b51aee952c555bcf69024 (patch) | |
| tree | ff041c03ac0251468eb4308927052f8bd6071ca3 /lib/dojo/when.js | |
| parent | 9f539be3c2c93ce358b10ca396e922b3b99b56ea (diff) | |
lib: Upgrade Dojo and Dijit from 1.8.3 to 1.12.1
The itemNode and expandoNode elements have changed from img to
span (https://bugs.dojotoolkit.org/ticket/16699), so we now put our
tree icons inside them rather than replacing them.
Signed-off-by: Anders Kaseorg <[email protected]>
Diffstat (limited to 'lib/dojo/when.js')
| -rw-r--r-- | lib/dojo/when.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dojo/when.js b/lib/dojo/when.js index 5acb90d6a..d63eed47c 100644 --- a/lib/dojo/when.js +++ b/lib/dojo/when.js @@ -1,8 +1,8 @@ /* - Copyright (c) 2004-2012, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2016, The JS Foundation All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified BSD license. see: http://dojotoolkit.org/license for details */ //>>built -define("dojo/when",["./Deferred","./promise/Promise"],function(_1,_2){"use strict";return function when(_3,_4,_5,_6){var _7=_3&&typeof _3.then==="function";var _8=_7&&_3 instanceof _2;if(!_7){if(_4){return _4(_3);}else{return new _1().resolve(_3);}}else{if(!_8){var _9=new _1(_3.cancel);_3.then(_9.resolve,_9.reject,_9.progress);_3=_9.promise;}}if(_4||_5||_6){return _3.then(_4,_5,_6);}return _3;};});
\ No newline at end of file +define("dojo/when",["./Deferred","./promise/Promise"],function(_1,_2){"use strict";return function when(_3,_4,_5,_6){var _7=_3&&typeof _3.then==="function";var _8=_7&&_3 instanceof _2;if(!_7){if(arguments.length>1){return _4?_4(_3):_3;}else{return new _1().resolve(_3);}}else{if(!_8){var _9=new _1(_3.cancel);_3.then(_9.resolve,_9.reject,_9.progress);_3=_9.promise;}}if(_4||_5||_6){return _3.then(_4,_5,_6);}return _3;};});
\ No newline at end of file |