[48/50] [abbrv] fauxton commit: updated refs/heads/import-master to b32c617

[kx...@apache.org]

Fix the build for the d3 update


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/0087fabb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/0087fabb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/0087fabb

Branch: refs/heads/import-master
Commit: 0087fabbbaa58b9f4bafaba8e5968288cc6c4bba
Parents: 659b402
Author: suelockwood <de...@apache.org>
Authored: Wed Mar 26 21:12:19 2014 +0100
Committer: suelockwood <de...@apache.org>
Committed: Wed Mar 26 16:48:55 2014 -0400

----------------------------------------------------------------------
 app/config.js               |  8 ++------
 assets/js/libs/d3.global.js | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0087fabb/app/config.js
----------------------------------------------------------------------
diff --git a/app/config.js b/app/config.js
index d33f3b8..3ed1c31 100644
--- a/app/config.js
+++ b/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) {});

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0087fabb/assets/js/libs/d3.global.js
----------------------------------------------------------------------
diff --git a/assets/js/libs/d3.global.js b/assets/js/libs/d3.global.js
new file mode 100644
index 0000000..9f38d04
--- /dev/null
+++ b/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 = _;
+});