couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject git commit: add dependacies and revert app.host change
Date Mon, 18 Mar 2013 07:36:36 GMT
Updated Branches:
  refs/heads/fauxton ca8548ec9 -> 2172a0b3f


add dependacies and revert app.host change


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

Branch: refs/heads/fauxton
Commit: 2172a0b3f62be19157e30204b6b197fc8e228963
Parents: ca8548e
Author: Garren Smith <garren.smith@gmail.com>
Authored: Mon Mar 18 09:36:22 2013 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Mon Mar 18 09:36:22 2013 +0200

----------------------------------------------------------------------
 src/fauxton/app/initialize.js |    4 ++--
 src/fauxton/package.json      |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/2172a0b3/src/fauxton/app/initialize.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/initialize.js b/src/fauxton/app/initialize.js
index eea19d1..5699678 100644
--- a/src/fauxton/app/initialize.js
+++ b/src/fauxton/app/initialize.js
@@ -27,8 +27,8 @@ function(app, _, Bootstrap) {
     // The root path to run the application through.
     // TODO: pick this up wither at build time or from the browser
     root: "/_utils/fauxton/",
-    // Firefox does not support window.location.origin so have to check first
-    host: (window.location.origin) ? window.location.origin : window.location.protocol +
"//" + window.location.host,
+
+    host: window.location.protocol + "//" + window.location.host,
 
     renderView: function(baseView, selector, view, options, callback) {
       baseView.setView(selector, new view(options)).render().then(callback);

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2172a0b3/src/fauxton/package.json
----------------------------------------------------------------------
diff --git a/src/fauxton/package.json b/src/fauxton/package.json
index f1637e7..a5fc567 100644
--- a/src/fauxton/package.json
+++ b/src/fauxton/package.json
@@ -18,7 +18,9 @@
     "grunt-jasmine-task": "~0.2.0",
     "underscore": "~1.4.2",
     "url": "~0.7.9",
-    "urls": "~0.0.3"
+    "urls": "~0.0.3",
+    "express": "~3.0.0",
+    "http-proxy": "~0.9.1"
   },
   "devDependencies": {},
   "scripts": {


Mime
View raw message