From 6887a0f57307820b097b51aee952c555bcf69024 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 20 Jan 2017 12:29:59 -0500 Subject: 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 --- lib/dojo/dojo.profile.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib/dojo/dojo.profile.js') diff --git a/lib/dojo/dojo.profile.js b/lib/dojo/dojo.profile.js index 4b24edb5e..7a2f24dbf 100644 --- a/lib/dojo/dojo.profile.js +++ b/lib/dojo/dojo.profile.js @@ -1,5 +1,6 @@ var profile = (function(){ - var testResourceRe = /^dojo\/tests\//, + var testResourceRe = /^dojo\/tests(?:DOH)?\//, + nodeModulesRe = /\/node_modules\//, copyOnly = function(filename, mid){ var list = { @@ -19,13 +20,14 @@ var profile = (function(){ /^dojo\/_base\/config\w+$/.test(mid) || (/^dojo\/resources\//.test(mid) && !/\.css$/.test(filename)) || /(png|jpg|jpeg|gif|tiff)$/.test(filename) || + nodeModulesRe.test(mid) || /built\-i18n\-test\/152\-build/.test(mid); }; return { resourceTags:{ test: function(filename, mid){ - return testResourceRe.test(mid) || mid=="dojo/tests" || mid=="dojo/robot" || mid=="dojo/robotx"; + return testResourceRe.test(mid) || mid=="dojo/robot" || mid=="dojo/robotx"; }, copyOnly: function(filename, mid){ @@ -34,6 +36,10 @@ var profile = (function(){ amd: function(filename, mid){ return !testResourceRe.test(mid) && !copyOnly(filename, mid) && /\.js$/.test(filename); + }, + + miniExclude: function(filename, mid){ + return nodeModulesRe.test(mid); } } }; -- cgit v1.2.3-54-g00ecf