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 2016/11/08 08:26:51 UTC
fauxton commit: updated refs/heads/master to 2a8e991
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master a9a10999f -> 2a8e991f8
put updateAPIBar in setTimeout
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/2a8e991f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/2a8e991f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/2a8e991f
Branch: refs/heads/master
Commit: 2a8e991f8f3dccbe3498a705f524465bfee5f5d8
Parents: a9a1099
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Nov 8 10:26:41 2016 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Nov 8 10:26:41 2016 +0200
----------------------------------------------------------------------
app/addons/components/layouts.js | 40 ++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2a8e991f/app/addons/components/layouts.js
----------------------------------------------------------------------
diff --git a/app/addons/components/layouts.js b/app/addons/components/layouts.js
index df4b85e..3bc9c23 100644
--- a/app/addons/components/layouts.js
+++ b/app/addons/components/layouts.js
@@ -1,32 +1,34 @@
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// Licensed under the Apache License, Version 2.0 (the 'License'); you may not
// use this file except in compliance with the License. You may obtain a copy of
// the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
// License for the specific language governing permissions and limitations under
// the License.
import React from 'react';
import ReactDOM from 'react-dom';
-import {NotificationCenterButton} from "../fauxton/notifications/notifications.react";
+import {NotificationCenterButton} from '../fauxton/notifications/notifications.react';
import {ApiBarController} from './components/apibar';
import {Breadcrumbs} from './header-breadcrumbs';
-import ComponentActions from "./actions";
+import ComponentActions from './actions';
const ApiBarWrapper = ({docURL, endpoint}) => {
//TODO once all modules are using this remove actions and make them props
- ComponentActions.updateAPIBar({
- buttonVisible: true,
- contentVisible: false,
- endpoint,
- docURL
+ setTimeout(() => {
+ ComponentActions.updateAPIBar({
+ buttonVisible: true,
+ contentVisible: false,
+ endpoint,
+ docURL
+ });
});
return (
- <div id="api-navbar">
+ <div id='api-navbar'>
<ApiBarController
buttonVisible={true}
contentVisible={false}
@@ -37,7 +39,7 @@ const ApiBarWrapper = ({docURL, endpoint}) => {
export const OnePane = ({children}) => {
return (
- <div id="dashboard" className="one-pane ">
+ <div id='dashboard' className='one-pane '>
{children}
</div>
);
@@ -46,15 +48,15 @@ export const OnePane = ({children}) => {
export const OnePaneHeader = ({showApiUrl, docURL, endpoint, crumbs, children}) => {
return (
<header>
- <div className="flex-layout flex-row">
- <div id="breadcrumbs" className="flex-body">
+ <div className='flex-layout flex-row'>
+ <div id='breadcrumbs' className='flex-body'>
<Breadcrumbs crumbs={crumbs}/>
</div>
- <div id="right-header">
+ <div id='right-header'>
{children}
</div>
{showApiUrl ? <ApiBarWrapper docURL={docURL} endpoint={endpoint} /> : null}
- <div id="notification-center-btn">
+ <div id='notification-center-btn'>
<NotificationCenterButton />
</div>
</div>
@@ -74,12 +76,12 @@ OnePaneHeader.propTypes = {
export const OnePaneContent = ({children}) => {
return (
- <div className="content-area container-fluid">
- <div id="tabs"></div>
- <div id="dashboard-content" className="scrollable">
+ <div className='content-area container-fluid'>
+ <div id='tabs'></div>
+ <div id='dashboard-content' className='scrollable'>
{children}
</div>
- <div id="footer"></div>
+ <div id='footer'></div>
</div>
);
};