couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chewbra...@apache.org
Subject [46/46] git commit: updated refs/heads/1829-User-Experience-Redesign to b7ee0e5
Date Tue, 25 Jun 2013 21:07:53 GMT
Switch out almond.js to fix loading external urls


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

Branch: refs/heads/1829-User-Experience-Redesign
Commit: b7ee0e5dc981c61f5d85fb12a18f9398e941da62
Parents: 6f33961
Author: Russell Branca <chewbranca@gmail.com>
Authored: Tue Jun 25 14:07:02 2013 -0700
Committer: Russell Branca <chewbranca@gmail.com>
Committed: Tue Jun 25 14:07:02 2013 -0700

----------------------------------------------------------------------
 src/fauxton/Gruntfile.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/b7ee0e5d/src/fauxton/Gruntfile.js
----------------------------------------------------------------------
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index b76ae24..6cf4e89 100644
--- a/src/fauxton/Gruntfile.js
+++ b/src/fauxton/Gruntfile.js
@@ -148,13 +148,13 @@ module.exports = function(grunt) {
 
     template: templateSettings,
 
-    // The concatenate task is used here to merge the almond require/define
+    // The concatenate task is used here to merge the require.js require/define
     // shim and the templates into the application code.  It's named
     // dist/debug/require.js, because we want to only load one script file in
     // index.html.
     concat: {
       requirejs: {
-        src: ["assets/js/libs/almond.js", "dist/debug/templates.js", "dist/debug/require.js"],
+        src: ["assets/js/libs/require.js", "dist/debug/templates.js", "dist/debug/require.js"],
         dest: "dist/debug/js/require.js"
       },
 


Mime
View raw message