couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [4/4] fauxton commit: updated refs/heads/master to 64e3b08
Date Tue, 02 Sep 2014 12:09:15 GMT
Update velocity to 1.0.0

Includes a upstream fix for AMD loaders. Velocity 1.0 which was
released a few days ago does not have an own jquery file, I
readded velocity.ui as an own file and changed the require.js
configuration


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

Branch: refs/heads/master
Commit: 64e3b08624e4ddac30151981ff0dda18a20bef18
Parents: 7a383eb
Author: Robert Kowalski <rok@kowalski.gd>
Authored: Sun Aug 31 15:29:53 2014 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Tue Sep 2 14:08:50 2014 +0200

----------------------------------------------------------------------
 app/addons/fauxton/components.js     |    2 +-
 app/config.js                        |   11 +-
 assets/js/plugins/jquery.velocity.js | 4073 -----------------------------
 assets/js/plugins/velocity.js        | 3782 ++++++++++++++++++++++++++
 assets/js/plugins/velocity.ui.js     |  672 +++++
 5 files changed, 4463 insertions(+), 4077 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/64e3b086/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js
index 4b1ec71..a58de19 100644
--- a/app/addons/fauxton/components.js
+++ b/app/addons/fauxton/components.js
@@ -29,7 +29,7 @@ define([
   // this should never be global available:
   // https://github.com/zeroclipboard/zeroclipboard/blob/master/docs/security.md
   "plugins/zeroclipboard/ZeroClipboard",
-  "velocity"
+  "velocity.ui"
 ],
 
 function(app, FauxtonAPI, ace, spin, ZeroClipboard) {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/64e3b086/app/config.js
----------------------------------------------------------------------
diff --git a/app/config.js b/app/config.js
index d25976c..652ac68 100644
--- a/app/config.js
+++ b/app/config.js
@@ -32,7 +32,8 @@ require.config({
     "nv.d3": "../assets/js/libs/nv.d3",
     "ace":"../assets/js/libs/ace",
     "cloudant.pagingcollection": "../assets/js/plugins/cloudant.pagingcollection",
-    "velocity": "../assets/js/plugins/jquery.velocity"
+    "velocity": "../assets/js/plugins/velocity",
+    "velocity.ui": "../assets/js/plugins/velocity.ui",
   },
 
   baseUrl: '/',
@@ -55,11 +56,15 @@ require.config({
       deps: ["jquery"],
       exports: "Bootstrap"
     },
-    
+
     "plugins/prettify": [],
     "plugins/beautify": [],
 
-    "plugins/jquery.form": ["jquery"]
+    "plugins/jquery.form": ["jquery"],
+
+    "velocity": ["jquery"],
+
+    "velocity.ui": ["velocity"]
   }
 });
 


Mime
View raw message