You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by de...@apache.org on 2014/03/14 02:58:02 UTC
couchdb commit: updated
refs/heads/2128-config-validation-autocomplete to add32d6
Repository: couchdb
Updated Branches:
refs/heads/2128-config-validation-autocomplete 91af9bb6a -> add32d646
Added modal to makefile.
Removed debugging alert.
Cleaned up error messaging to be consistent.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/add32d64
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/add32d64
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/add32d64
Branch: refs/heads/2128-config-validation-autocomplete
Commit: add32d6464eb0ce6391ab49efbbf4d43310e9e35
Parents: 91af9bb
Author: suelockwood <de...@apache.org>
Authored: Thu Mar 13 21:57:57 2014 -0400
Committer: suelockwood <de...@apache.org>
Committed: Thu Mar 13 21:57:57 2014 -0400
----------------------------------------------------------------------
src/Makefile.am | 1 +
src/fauxton/app/addons/config/views.js | 11 +++--------
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/add32d64/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 77bc0de..89a6afd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,6 +71,7 @@ FAUXTON_FILES = \
fauxton/app/addons/config/views.js \
fauxton/app/addons/config/routes.js \
fauxton/app/addons/config/views.js \
+ fauxton/app/addons/config/templates/modal.html \
fauxton/app/addons/config/templates/dashboard.html \
fauxton/app/addons/config/templates/item.html \
fauxton/app/addons/config/tests/resourcesSpec.js \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/add32d64/src/fauxton/app/addons/config/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/config/views.js b/src/fauxton/app/addons/config/views.js
index b5fd1e9..2f381a7 100644
--- a/src/fauxton/app/addons/config/views.js
+++ b/src/fauxton/app/addons/config/views.js
@@ -68,9 +68,6 @@ function(app, FauxtonAPI, Config, Components) {
cancelEdit: function (event) {
this.discardValue();
- this.$("#edit-value-form").hide();
- this.$("#show-value").show();
-
},
serialize: function () {
@@ -94,9 +91,7 @@ function(app, FauxtonAPI, Config, Components) {
initialize: function(){
this.listenTo(Views.Events, "newSection", this.render);
},
- alert: function(){
- console.log('bleh');
- },
+
addSection: function (event) {
event.preventDefault();
this.modal.show();
@@ -192,9 +187,9 @@ function(app, FauxtonAPI, Config, Components) {
collection = this.collection;
if(!this.isSection()){
- this.errorMessage("You need to use an existing section.");
+ this.errorMessage("You need to use an existing section");
} else if (!name) {
- this.errorMessage("Add a name.");
+ this.errorMessage("Add a name");
} else if (!value) {
this.errorMessage("Add a value");
} else if (this.isNew(collection)){