You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2014/02/20 17:04:16 UTC
[02/14] couchdb commit: updated refs/heads/paginate-api-options to
75c7077
Fix Fauxton's define paths to match mixedCase style
As bonus trailing spaces were striped.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/dea6cef5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/dea6cef5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/dea6cef5
Branch: refs/heads/paginate-api-options
Commit: dea6cef58b4074d8b82270fe23928231bf1863f7
Parents: 5d17c20
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Feb 20 03:09:32 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Feb 20 03:09:32 2014 +0400
----------------------------------------------------------------------
src/fauxton/app/addons/auth/resources.js | 20 ++++++++++----------
src/fauxton/app/addons/documents/views.js | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/dea6cef5/src/fauxton/app/addons/auth/resources.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/auth/resources.js b/src/fauxton/app/addons/auth/resources.js
index ed06175..2e359c9 100644
--- a/src/fauxton/app/addons/auth/resources.js
+++ b/src/fauxton/app/addons/auth/resources.js
@@ -13,7 +13,7 @@
define([
"app",
"api",
- "core/CouchdbSession"
+ "core/couchdbSession"
],
function (app, FauxtonAPI, CouchdbSession) {
@@ -55,7 +55,7 @@ function (app, FauxtonAPI, CouchdbSession) {
_.bindAll(this);
- this.messages = _.extend({}, {
+ this.messages = _.extend({}, {
missingCredentials: 'Username or password cannot be blank.',
passwordsNotMatch: 'Passwords do not match.',
incorrectCredentials: 'Incorrect username or password.',
@@ -88,7 +88,7 @@ function (app, FauxtonAPI, CouchdbSession) {
userRoles: function () {
var user = this.user();
- if (user && user.roles) {
+ if (user && user.roles) {
return user.roles;
}
@@ -157,8 +157,8 @@ function (app, FauxtonAPI, CouchdbSession) {
return $.ajax({
cache: false,
- type: "POST",
- url: app.host + "/_session",
+ type: "POST",
+ url: app.host + "/_session",
dataType: "json",
data: {name: username, password: password}
}).then(function () {
@@ -170,10 +170,10 @@ function (app, FauxtonAPI, CouchdbSession) {
var that = this;
return $.ajax({
- type: "DELETE",
- url: app.host + "/_session",
+ type: "DELETE",
+ url: app.host + "/_session",
dataType: "json",
- username : "_",
+ username : "_",
password : "_"
}).then(function () {
return that.fetchUser({forceFetch: true });
@@ -315,7 +315,7 @@ function (app, FauxtonAPI, CouchdbSession) {
}
});
- Auth.NavLink = FauxtonAPI.View.extend({
+ Auth.NavLink = FauxtonAPI.View.extend({
template: 'addons/auth/templates/nav_link_title',
tagName: 'li',
@@ -331,7 +331,7 @@ function (app, FauxtonAPI, CouchdbSession) {
}
});
- Auth.NavDropDown = FauxtonAPI.View.extend({
+ Auth.NavDropDown = FauxtonAPI.View.extend({
template: 'addons/auth/templates/nav_dropdown',
beforeRender: function () {
http://git-wip-us.apache.org/repos/asf/couchdb/blob/dea6cef5/src/fauxton/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js
index 62d8761..7282ed7 100644
--- a/src/fauxton/app/addons/documents/views.js
+++ b/src/fauxton/app/addons/documents/views.js
@@ -21,7 +21,7 @@ define([
"addons/pouchdb/base",
// Libs
- "addons/Fauxton/resizeColumns",
+ "addons/fauxton/resizeColumns",
// Plugins
"plugins/beautify",
@@ -952,7 +952,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum
//not complete doc. Cannot work with it
return;
}
-
+
var keyChecked = ["_id"];
if (model.get("_rev")) { keyChecked.push("_rev");}