diff options
author | suelockwood <deathbear@apache.org> | 2014-03-26 21:12:19 +0100 |
---|---|---|
committer | suelockwood <deathbear@apache.org> | 2014-03-26 16:48:55 -0400 |
commit | c84a71cb9b3d8fd20fe7b8df0a320152e035d6e2 (patch) | |
tree | f3a34111b3c18a50b543de9edccec0c863ae61bd | |
parent | 282cddf1f6ac6cb37f6b14e2aa8beeb585b3b91e (diff) | |
download | couchdb-c84a71cb9b3d8fd20fe7b8df0a320152e035d6e2.tar.gz |
Fix the build for the d3 update
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/fauxton/app/config.js | 8 | ||||
-rw-r--r-- | src/fauxton/assets/js/libs/d3.global.js | 18 |
3 files changed, 21 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e1007f962..ccf6ccd10 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -251,6 +251,7 @@ FAUXTON_FILES = \ fauxton/assets/js/libs/backbone.js \ fauxton/assets/js/libs/bootstrap.js \ fauxton/assets/js/libs/d3.js \ + fauxton/assets/js/libs/d3.global.js \ fauxton/assets/js/libs/jquery.js \ fauxton/assets/js/libs/lodash.js \ fauxton/assets/js/libs/nv.d3.js \ diff --git a/src/fauxton/app/config.js b/src/fauxton/app/config.js index d33f3b8b7..3ed1c317f 100644 --- a/src/fauxton/app/config.js +++ b/src/fauxton/app/config.js @@ -30,7 +30,8 @@ require.config({ spin: "../assets/js/libs/spin.min", d3: "../assets/js/libs/d3", "nv.d3": "../assets/js/libs/nv.d3", - "ace":"../assets/js/libs/ace" + "ace":"../assets/js/libs/ace", + "d3.global": "../assets/js/libs/d3.global" }, baseUrl: '/', @@ -63,8 +64,3 @@ require.config({ } }); -define("d3.global", ["d3"], function(_) { - d3 = _; -}); - -require(["d3", "nv.d3"], function(d3, nvd3) {}); diff --git a/src/fauxton/assets/js/libs/d3.global.js b/src/fauxton/assets/js/libs/d3.global.js new file mode 100644 index 000000000..9f38d04ec --- /dev/null +++ b/src/fauxton/assets/js/libs/d3.global.js @@ -0,0 +1,18 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy of +// the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations under +// the License. + +// Set the require.js configuration for your application. + +define("d3.global", ["d3"], function(_) { + //get that global back + d3 = _; +}); |