projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v2.0'
[osm/UI.git]
/
skyquake
/
plugins
/
composer
/
src
/
src
/
components
/
CanvasPanel.js
diff --git
a/skyquake/plugins/composer/src/src/components/CanvasPanel.js
b/skyquake/plugins/composer/src/src/components/CanvasPanel.js
index
96904ea
..
160db5f
100644
(file)
--- a/
skyquake/plugins/composer/src/src/components/CanvasPanel.js
+++ b/
skyquake/plugins/composer/src/src/components/CanvasPanel.js
@@
-18,7
+18,7
@@
*/
'use strict';
*/
'use strict';
-import _
from 'lodash
'
+import _
includes from 'lodash/includes
'
import cc from 'change-case'
import React from 'react'
import PureRenderMixin from 'react-addons-pure-render-mixin'
import cc from 'change-case'
import React from 'react'
import PureRenderMixin from 'react-addons-pure-render-mixin'
@@
-81,9
+81,13
@@
const CanvasPanel = React.createClass({
<button className={isDescriptorView ? '-selected' : ''} onClick={ComposerAppActions.showDescriptor}>
Descriptor
</button>
<button className={isDescriptorView ? '-selected' : ''} onClick={ComposerAppActions.showDescriptor}>
Descriptor
</button>
- <button className={!isDescriptorView ? '-selected' : ''} onClick={ComposerAppActions.showAssets}>
- Assets
- </button>
+ {
+ this.props.files ?
+ <button className={!isDescriptorView ? '-selected' : ''} onClick={ComposerAppActions.showAssets}>
+ Assets
+ </button>
+ : null
+ }
</div>
</div>
)
</div>
</div>
)
@@
-97,7
+101,7
@@
const CanvasPanel = React.createClass({
</div>
{viewButtonTabs}
<div className="CanvasPanelBody panel-body" style={{marginRight: this.props.layout.right, bottom: this.props.layout.bottom}} >
</div>
{viewButtonTabs}
<div className="CanvasPanelBody panel-body" style={{marginRight: this.props.layout.right, bottom: this.props.layout.bottom}} >
- {hasNoCatalogs ? null : viewFiles ? <FileManager files={this.props.files} type={this.props.type} item={this.props.item} filesState={this.props.filesState} /> : bodyComponent}
+ {hasNoCatalogs ? null : viewFiles ? <FileManager files={this.props.files} type={this.props.type} item={this.props.item} filesState={this.props.filesState}
newPathName={this.props.newPathName}
/> : bodyComponent}
</div>
{
isDescriptorView ?
</div>
{
isDescriptorView ?
@@
-111,7
+115,7
@@
const CanvasPanel = React.createClass({
);
},
onDragOver(event) {
);
},
onDragOver(event) {
- const isDraggingFiles = _
.
includes(event.dataTransfer.types, 'Files');
+ const isDraggingFiles = _includes(event.dataTransfer.types, 'Files');
if (!isDraggingFiles) {
event.preventDefault();
event.dataTransfer.dropEffect = 'copy';
if (!isDraggingFiles) {
event.preventDefault();
event.dataTransfer.dropEffect = 'copy';