You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2015/06/23 15:43:53 UTC
[1/2] fauxton commit: updated refs/heads/master to bf1c92c
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 7be921ad6 -> bf1c92c08
config: fix coding style
PR: #471
PR-URL: https://github.com/apache/couchdb-fauxton/pull/471
Reviewed-By: Michelle Phung <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/bf1c92c0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/bf1c92c0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/bf1c92c0
Branch: refs/heads/master
Commit: bf1c92c083ed7e2c126f0b798a4bfc64e99da050
Parents: eec9de7
Author: Robert Kowalski <ro...@apache.org>
Authored: Tue Jun 23 14:30:00 2015 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Tue Jun 23 15:43:51 2015 +0200
----------------------------------------------------------------------
app/addons/config/base.js | 13 +++++++++----
app/addons/config/resources.js | 12 ++++++------
app/addons/config/routes.js | 6 +++---
3 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bf1c92c0/app/addons/config/base.js
----------------------------------------------------------------------
diff --git a/app/addons/config/base.js b/app/addons/config/base.js
index 6c59e43..229c48f 100644
--- a/app/addons/config/base.js
+++ b/app/addons/config/base.js
@@ -11,17 +11,22 @@
// the License.
define([
- "app",
+ 'app',
- "api",
+ 'api',
// Modules
- "addons/config/routes"
+ 'addons/config/routes'
],
function (app, FauxtonAPI, Config) {
Config.initialize = function () {
- FauxtonAPI.addHeaderLink({title: "Config", href: "#_config", icon:"fonticon-cog", className: 'config'});
+ FauxtonAPI.addHeaderLink({
+ title: 'Config',
+ href: '#_config',
+ icon: 'fonticon-cog',
+ className: 'config'
+ });
};
return Config;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bf1c92c0/app/addons/config/resources.js
----------------------------------------------------------------------
diff --git a/app/addons/config/resources.js b/app/addons/config/resources.js
index b1b4080..468860c 100644
--- a/app/addons/config/resources.js
+++ b/app/addons/config/resources.js
@@ -11,8 +11,8 @@
// the License.
define([
- "app",
- "api"
+ 'app',
+ 'api'
],
@@ -26,7 +26,7 @@ function (app, FauxtonAPI) {
documentation: FauxtonAPI.constants.DOC_URLS.CONFIG,
url: function () {
- return app.host + '/_config/' + this.get("section") + '/' + encodeURIComponent(this.get("name"));
+ return app.host + '/_config/' + this.get('section') + '/' + encodeURIComponent(this.get('name'));
},
isNew: function () { return false; },
@@ -55,8 +55,8 @@ function (app, FauxtonAPI) {
documentation: FauxtonAPI.constants.DOC_URLS.CONFIG,
comparator: function (OptionModel) {
- if (OptionModel.get("section")) {
- return OptionModel.get("section");
+ if (OptionModel.get('section')) {
+ return OptionModel.get('section');
}
},
@@ -65,7 +65,7 @@ function (app, FauxtonAPI) {
},
findEntryInSection: function (sectionName, entry) {
- var section = _.findWhere(this.toJSON(), {"section": sectionName}),
+ var section = _.findWhere(this.toJSON(), {'section': sectionName}),
options;
if (!section) {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/bf1c92c0/app/addons/config/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/config/routes.js b/app/addons/config/routes.js
index 6ae6dc5..77d46da 100644
--- a/app/addons/config/routes.js
+++ b/app/addons/config/routes.js
@@ -27,7 +27,7 @@ function (app, FauxtonAPI, Config, Views, CORSComponents, CORSActions) {
initialize: function () {
this.configs = new Config.Collection();
- this.sidebar = this.setView("#sidebar-content", new Views.Tabs({
+ this.sidebar = this.setView('#sidebar-content', new Views.Tabs({
sidebarItems: [
{
title: 'Main config',
@@ -62,14 +62,14 @@ function (app, FauxtonAPI, Config, Views, CORSComponents, CORSActions) {
config: function () {
this.newSection = this.setView('#right-header', new Views.ConfigHeader({ collection: this.configs }));
this.setView('#dashboard-content', new Views.Table({ collection: this.configs }));
- this.sidebar.setSelectedTab("main");
+ this.sidebar.setSelectedTab('main');
},
configCORS: function () {
this.removeView('#right-header');
this.newSection = this.setComponent('#dashboard-content', CORSComponents.CORSController);
CORSActions.FetchAndEditCors();
- this.sidebar.setSelectedTab("cors");
+ this.sidebar.setSelectedTab('cors');
},
establish: function () {
[2/2] fauxton commit: updated refs/heads/master to bf1c92c
Posted by ro...@apache.org.
sidebar: remove dead code
PR: #471
PR-URL: https://github.com/apache/couchdb-fauxton/pull/471
Reviewed-By: Michelle Phung <mi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/eec9de7b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/eec9de7b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/eec9de7b
Branch: refs/heads/master
Commit: eec9de7b95e976f37bdc91241a853e8020a60129
Parents: 7be921a
Author: Robert Kowalski <ro...@apache.org>
Authored: Tue Jun 23 14:29:40 2015 +0200
Committer: Robert Kowalski <ro...@apache.org>
Committed: Tue Jun 23 15:43:51 2015 +0200
----------------------------------------------------------------------
app/addons/documents/sidebar/sidebar.react.jsx | 28 ---------------------
1 file changed, 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/eec9de7b/app/addons/documents/sidebar/sidebar.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/documents/sidebar/sidebar.react.jsx b/app/addons/documents/sidebar/sidebar.react.jsx
index 8e99842..143e6e2 100644
--- a/app/addons/documents/sidebar/sidebar.react.jsx
+++ b/app/addons/documents/sidebar/sidebar.react.jsx
@@ -27,33 +27,6 @@ function (app, FauxtonAPI, React, Stores, Actions, Components, DocumentViews) {
var store = Stores.sidebarStore;
var LoadLines = Components.LoadLines;
- var SidebarToggle = React.createClass({
- getInitialState: function () {
- return {
- hidden: false
- };
- },
-
- toggle: function (e) {
- e.preventDefault();
- var newHiddenState = !this.state.hidden;
- this.setState({hidden: newHiddenState});
- var $dashboard = $('#dashboard-content');
-
- if (newHiddenState) {
- $dashboard.animate({left: '210px'}, 300);
- } else {
- $dashboard.animate({left: '550px'}, 300);
- }
-
- },
-
- render: function () {
- return null;
- }
-
- });
-
var MainSidebar = React.createClass({
getNewButtonLinks: function () { //these are links for the sidebar '+' on All Docs and All Design Docs
@@ -427,7 +400,6 @@ function (app, FauxtonAPI, React, Stores, Actions, Components, DocumentViews) {
return (
<nav className="sidenav">
- <SidebarToggle />
<MainSidebar isActive={this.isActive} databaseName={this.state.databaseName} />
<DesignDocList
toggle={Actions.toggleContent}