revert removal of async.js which is needed for google maps, at least
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/94c35f15 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/94c35f15 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/94c35f15 Branch: refs/heads/0.5.0 Commit: 94c35f15ce7188f1b0de39f7137b43136912c4de Parents: e14c0e3 Author: Alex Heneveld <[email protected]> Authored: Mon Mar 11 12:50:50 2013 +0000 Committer: Alex Heneveld <[email protected]> Committed: Mon Mar 11 15:32:39 2013 +0000 ---------------------------------------------------------------------- usage/jsgui/src/main/webapp/assets/js/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/94c35f15/usage/jsgui/src/main/webapp/assets/js/config.js ---------------------------------------------------------------------- diff --git a/usage/jsgui/src/main/webapp/assets/js/config.js b/usage/jsgui/src/main/webapp/assets/js/config.js index 5c13d7a..dad0ff7 100644 --- a/usage/jsgui/src/main/webapp/assets/js/config.js +++ b/usage/jsgui/src/main/webapp/assets/js/config.js @@ -20,8 +20,8 @@ require.config({ "brooklyn-utils":"libs/brooklyn-utils", "datatables-extensions":"libs/dataTables.extensions", "googlemaps":"view/googlemaps", + "async":"libs/async", //not explicitly referenced, but needed for google "text":"libs/text", -// "async":"libs/async", "tpl":"../tpl" }, shim:{
