-
Notifications
You must be signed in to change notification settings - Fork 410
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix #1776. Move measure into burger menu #1790
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
web/client/components/mapcontrols/measure/MeasureDialog.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Copyright 2017, GeoSolutions Sas. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| */ | ||
|
|
||
| const React = require('react'); | ||
| const {Glyphicon} = require('react-bootstrap'); | ||
| const MeasureComponent = require('./MeasureComponent'); | ||
| const Message = require('../../I18N/Message'); | ||
| const Dialog = require('../../misc/Dialog'); | ||
|
|
||
|
|
||
| const MeasureDialog = React.createClass({ | ||
| propTypes: { | ||
| show: React.PropTypes.bool, | ||
| closeGlyph: React.PropTypes.string, | ||
| onClose: React.PropTypes.func | ||
| }, | ||
| getDefaultProps() { | ||
| return { | ||
| show: false, | ||
| closeGlyph: "1-close" | ||
| }; | ||
| }, | ||
| onClose() { | ||
| this.props.onClose(false); | ||
| }, | ||
| render() { | ||
| return this.props.show ? (<Dialog> | ||
| <div key="header" role="header"> | ||
| <Glyphicon glyph="1-ruler"/> <Message key="title" msgId="measureComponent.Measure"/> | ||
| <button key="close" onClick={this.onClose} className="close">{this.props.closeGlyph ? <Glyphicon glyph={this.props.closeGlyph}/> : <span>×</span>}</button> | ||
| </div> | ||
| <div key="body" className="panel-body" role="body"> | ||
| <MeasureComponent id="measure-panel" style={{ | ||
| minWidth: "500px" | ||
| }}{...this.props}/> | ||
| </div> | ||
| </Dialog>) : null; | ||
| } | ||
| }); | ||
| module.exports = MeasureDialog; |
136 changes: 0 additions & 136 deletions
136
web/client/components/mapcontrols/measure/MeasureResults.jsx
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
web/client/components/mapcontrols/measure/__tests__/MeasureDialog-test.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /** | ||
| * Copyright 2015, GeoSolutions Sas. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| */ | ||
| var expect = require('expect'); | ||
|
|
||
| var React = require('react'); | ||
| var ReactDOM = require('react-dom'); | ||
| const ReactTestUtils = require('react-addons-test-utils'); | ||
| var MeasureDialog = require('../MeasureDialog'); | ||
|
|
||
|
|
||
| describe("test the MeasureComponent", () => { | ||
| beforeEach((done) => { | ||
| document.body.innerHTML = '<div id="container"></div>'; | ||
| setTimeout(done); | ||
| }); | ||
|
|
||
| afterEach((done) => { | ||
| ReactDOM.unmountComponentAtNode(document.getElementById("container")); | ||
| document.body.innerHTML = ''; | ||
| setTimeout(done); | ||
| }); | ||
|
|
||
| it('test component creation', () => { | ||
| let measurement = {}; | ||
| const mc = ReactDOM.render(<MeasureDialog show={true} measurement={measurement}/>, document.getElementById("container")); | ||
| expect(mc).toExist(); | ||
| }); | ||
| it('test close', () => { | ||
| let measurement = {}; | ||
| const handlers = { | ||
| onClose() {} | ||
| }; | ||
| let spy = expect.spyOn(handlers, "onClose"); | ||
| const mc = ReactDOM.render(<MeasureDialog show={true} onClose={handlers.onClose} measurement={measurement}/>, document.getElementById("container")); | ||
| expect(mc).toExist(); | ||
| const dom = ReactDOM.findDOMNode(mc); | ||
| const closeBtn = dom.getElementsByClassName('close')[0]; | ||
| expect(closeBtn).toExist(); | ||
| ReactTestUtils.Simulate.click(closeBtn); | ||
| expect(spy.calls.length).toBe(1); | ||
| }); | ||
| }); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
const