You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by de...@apache.org on 2014/03/26 21:49:04 UTC
couchdb commit: updated refs/heads/master to c84a71c
Repository: couchdb
Updated Branches:
refs/heads/master 282cddf1f -> c84a71cb9
Fix the build for the d3 update
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c84a71cb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c84a71cb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c84a71cb
Branch: refs/heads/master
Commit: c84a71cb9b3d8fd20fe7b8df0a320152e035d6e2
Parents: 282cddf
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
----------------------------------------------------------------------
src/Makefile.am | 1 +
src/fauxton/app/config.js | 8 ++------
src/fauxton/assets/js/libs/d3.global.js | 18 ++++++++++++++++++
3 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c84a71cb/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index e1007f9..ccf6ccd 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 \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c84a71cb/src/fauxton/app/config.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/config.js b/src/fauxton/app/config.js
index d33f3b8..3ed1c31 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) {});
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c84a71cb/src/fauxton/assets/js/libs/d3.global.js
----------------------------------------------------------------------
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 0000000..9f38d04
--- /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 = _;
+});