Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ED72511B46 for ; Mon, 25 Aug 2014 13:39:46 +0000 (UTC) Received: (qmail 9811 invoked by uid 500); 25 Aug 2014 13:39:44 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 9655 invoked by uid 500); 25 Aug 2014 13:39:44 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 9379 invoked by uid 99); 25 Aug 2014 13:39:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Aug 2014 13:39:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 43EE19CEEFB; Mon, 25 Aug 2014 13:39:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: deathbear@apache.org To: commits@couchdb.apache.org Date: Mon, 25 Aug 2014 13:40:25 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [45/48] fauxton commit: updated refs/heads/secondary-indexes to 8688d16 fixing some padding issues in other addons Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/86373289 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/86373289 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/86373289 Branch: refs/heads/secondary-indexes Commit: 86373289a5cd4fe4680ebc0e0a052249044a63b4 Parents: 96bd61a Author: deathbearbrown Authored: Sun Aug 24 16:33:43 2014 +0200 Committer: deathbearbrown Committed: Mon Aug 25 09:37:37 2014 -0400 ---------------------------------------------------------------------- app/addons/config/views.js | 10 ++++++---- app/addons/replication/views.js | 11 ++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/86373289/app/addons/config/views.js ---------------------------------------------------------------------- diff --git a/app/addons/config/views.js b/app/addons/config/views.js index 7952182..792af32 100644 --- a/app/addons/config/views.js +++ b/app/addons/config/views.js @@ -46,7 +46,7 @@ function(app, FauxtonAPI, Config, Components) { uniqueName: function(name){ var section = _.findWhere(this.collection.toJSON(), {"section":this.model.get("section")}); - + return _.findWhere(section.options, {name: name}); }, @@ -108,6 +108,8 @@ function(app, FauxtonAPI, Config, Components) { }); Views.Table = FauxtonAPI.View.extend({ + className: "view", + template: "addons/config/templates/dashboard", events: { @@ -158,8 +160,8 @@ function(app, FauxtonAPI, Config, Components) { "submit #js-add-section-form": "validate" }, initialize: function(){ - this.sourceArray = _.map(this.collection.toJSON(), function(item, key){ - return item.section; + this.sourceArray = _.map(this.collection.toJSON(), function(item, key){ + return item.section; }); }, afterRender: function(){ @@ -200,7 +202,7 @@ function(app, FauxtonAPI, Config, Components) { name = this.$('input[name="name"]').val(); var section = _.findWhere(collection.toJSON(), {"section":sectionName}); var options = _.findWhere(section.options, {name: name}); - + return options; }, isSection: function(){ http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/86373289/app/addons/replication/views.js ---------------------------------------------------------------------- diff --git a/app/addons/replication/views.js b/app/addons/replication/views.js index a19e609..672022a 100644 --- a/app/addons/replication/views.js +++ b/app/addons/replication/views.js @@ -32,7 +32,7 @@ function(app, FauxtonAPI, Components, replication) { // ----------------------------------- // afterRender: autocomplete on the target input field // beforeRender: add the status table - // disableFields: disable non active fields on submit + // disableFields: disable non active fields on submit // enableFields: enable field when radio btns are clicked // establish: get the DB list for autocomplete // formValidation: make sure fields aren't empty @@ -43,6 +43,7 @@ function(app, FauxtonAPI, Components, replication) { // toggleAdvancedOptions: toggle advanced View.ReplicationForm = FauxtonAPI.View.extend({ + className: "view", template: "addons/replication/templates/form", events: { "submit #replication": "validate", @@ -153,7 +154,7 @@ function(app, FauxtonAPI, Components, replication) { } }); this.enableFields(); - }, + }, updateButtonText: function(wait){ var $button = this.$('#replication button[type=submit]'); if(wait){ @@ -163,7 +164,7 @@ function(app, FauxtonAPI, Components, replication) { } }, submit: function(e){ - this.disableFields(); + this.disableFields(); var formJSON = {}; _.map(this.$(e.currentTarget).serializeArray(), function(formData){ if(formData.value !== ''){ @@ -173,7 +174,7 @@ function(app, FauxtonAPI, Components, replication) { this.updateButtonText(true); this.startReplication(formJSON); - }, + }, swapFields: function(e){ //WALL O' VARIABLES var $fromSelect = this.$('#from_name'), @@ -219,7 +220,7 @@ function(app, FauxtonAPI, Components, replication) { }, beforeRender: function(){ this.collection.forEach(function(item) { - this.insertView(new View.replicationItem({ + this.insertView(new View.replicationItem({ model: item })); }, this);