couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [2/2] fauxton commit: updated refs/heads/fix-velocity-loading to 8786e85
Date Thu, 28 Aug 2014 09:39:33 GMT
Improve velocity dependancy managements


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

Branch: refs/heads/fix-velocity-loading
Commit: 8786e85b214228655170fccb42068f58bbe3bc3e
Parents: a595e27
Author: Garren Smith <garren.smith@gmail.com>
Authored: Thu Aug 28 11:39:21 2014 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Thu Aug 28 11:39:21 2014 +0200

----------------------------------------------------------------------
 app/addons/fauxton/base.js       | 6 ++----
 app/addons/fauxton/components.js | 3 ++-
 app/app.js                       | 5 ++---
 app/config.js                    | 4 +---
 4 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8786e85b/app/addons/fauxton/base.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/base.js b/app/addons/fauxton/base.js
index 3310972..0818af7 100644
--- a/app/addons/fauxton/base.js
+++ b/app/addons/fauxton/base.js
@@ -15,12 +15,10 @@ define([
   "api",
   "addons/fauxton/resizeColumns",
   "addons/fauxton/components",
-  "plugins/zeroclipboard/ZeroClipboard",
-  "velocity",
-  "velocity.ui"
+  "plugins/zeroclipboard/ZeroClipboard"
 ],
 
-function(app, FauxtonAPI, resizeColumns, Components, ZeroClipboard, velocity) {
+function(app, FauxtonAPI, resizeColumns, Components, ZeroClipboard) {
 
   var Fauxton = FauxtonAPI.addon();
   FauxtonAPI.addNotification = function (options) {

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

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8786e85b/app/app.js
----------------------------------------------------------------------
diff --git a/app/app.js b/app/app.js
index 8635eac..0d140a4 100644
--- a/app/app.js
+++ b/app/app.js
@@ -27,11 +27,10 @@ define([
   "core/couchdbSession",
   // Plugins.
   "plugins/backbone.layoutmanager",
-  "plugins/jquery.form",
-  "velocity"
+  "plugins/jquery.form"
 ],
 
-function(app, $, _, Backbone, Bootstrap, Helpers, Utils, FauxtonAPI, Couchdb, velocity) {
+function(app, $, _, Backbone, Bootstrap, Helpers, Utils, FauxtonAPI, Couchdb) {
   // Make sure we have a console.log
   if (typeof console == "undefined") {
     console = {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8786e85b/app/config.js
----------------------------------------------------------------------
diff --git a/app/config.js b/app/config.js
index 8e92d19..bb33afb 100644
--- a/app/config.js
+++ b/app/config.js
@@ -62,9 +62,7 @@ require.config({
 
     "plugins/jquery.form": ["jquery"],
 
-    "velocity": ["jquery"],
-
-    "velocity.ui": ["jquery", "velocity"]
+    "velocity.ui": ["velocity"]
   }
 });
 


Mime
View raw message