Fix #1631. Implemented full screen button #1638

offtherailz · 2017-03-24T15:37:14Z

Fix Geometric operation DWITHIN and WITHIN returns wrong results #1931. Full screen button added to desktop, embedded and mobile versions
Now all modals and dialogs work in embedded and fullscreen mode
Review of zoomto icon (too similar to full screen)
Added tutorial step for fullscreen button

mbarto · 2017-03-24T15:45:59Z

web/client/components/TOC/fragments/SettingsModal.jsx

@@ -153,7 +153,7 @@ const SettingsModal = React.createClass({

        if (this.props.settings.expanded) {
            return this.props.asModal ? (
-                <Modal {...this.props.options} show={this.props.settings.expanded} container={document.getElementById("body")}>
+                <Modal {...this.props.options} container={document.querySelector(".ms2 > #container") } show={this.props.settings.expanded}>


cannot be fixed, at least it should be a property, better if it's not spread into every dialog. We should find a way to make it transparent. ms2 is overridable. #container is worse, this is a container, we cannot know the name, and we don't want to know it

mbarto · 2017-03-24T15:46:06Z

web/client/components/TOC/fragments/SettingsModal.jsx

@@ -162,7 +162,7 @@ const SettingsModal = React.createClass({
                        {footer}
                    </Modal.Footer>
                </Modal>
-            ) : (<Portal><Dialog id={this.props.id} style={this.props.panelStyle} className={this.props.panelClassName}>
+            ) : (<Portal container={document.querySelector(".ms2 > #container") }><Dialog id={this.props.id} style={this.props.panelStyle} className={this.props.panelClassName}>


mbarto · 2017-03-24T15:46:21Z

web/client/components/buttons/InfoButton.jsx

@@ -86,6 +86,7 @@ const InfoButton = React.createClass({
    },
    render() {
        const dialog = this.props.useModal ? (<Modal
+            container={document.querySelector(".ms2 > #container") }


mbarto

Look at hard coded stuff

- Full screen button added to desktop, embedded and mobile versions - Now all modals and dialogs work in embedded and fullscreen mode - Review of zoomto icon (too similar to full screen) - Added tutorial step for fullscreen button

outdated

mbarto · 2017-03-31T15:28:16Z

package.json

@@ -151,6 +151,7 @@
    "redux-undo": "0.5.0",
    "reselect": "2.5.1",
    "rxjs": "5.1.1",
+    "screenfull": "^3.1.0",


mbarto · 2017-03-31T15:29:21Z

web/client/components/data/featuregrid/DockedFeatureGrid.jsx

-               // this.onGridClose(true);
-            }}>
+            <Modal
+                container={document.querySelector(".ms2 > #container") }


Please remove

mbarto · 2017-03-31T15:30:45Z

web/client/components/data/identify/GeocodeViewer.jsx

@@ -29,7 +29,7 @@ const GeocodeViewer = (props) => {
                    onClick={() => props.showRevGeocode({lat: props.latlng.lat, lng: lngCorrected})} >
                    {props.identifyRevGeocodeSubmitText}
                </Button>
-                <Modal {...props.modalOptions} show={props.showModalReverse} bsSize="large" container={document.getElementById("body")}>
+                <Modal {...props.modalOptions} show={props.showModalReverse} bsSize="large" container={document.querySelector(".ms2 > #container") }>


Please remove container

mbarto · 2017-03-31T15:30:49Z

web/client/components/data/query/QueryToolbar.jsx

@@ -80,7 +80,7 @@ const QueryToolbar = React.createClass({
                        <span><strong><I18N.Message msgId={"queryform.query"}/></strong></span>
                    </Button>
                </ButtonToolbar>
-                <Modal show={this.props.showGeneratedFilter ? true : false} bsSize="large">
+                <Modal container={document.querySelector(".ms2 > #container") } show={this.props.showGeneratedFilter ? true : false} bsSize="large">


Please remove container

mbarto · 2017-03-31T15:30:54Z

web/client/components/manager/rulesmanager/ActiveRuleModal.jsx

@@ -61,7 +61,7 @@ const ActiveRuleModal = React.createClass({
        const titleMsgId = "rulesmanager." + status + "Modal";
        const buttonMsgId = "rulesmanager." + status + "Button";
        return (
-            <Modal show={showModal} {...this.props} bsSize="small">
+            <Modal container={document.querySelector(".ms2 > #container") } show={showModal} {...this.props} bsSize="small">


Please remove container

mbarto · 2017-03-31T15:31:03Z

web/client/components/security/modals/PasswordResetModal.jsx

@@ -101,7 +101,9 @@ const PasswordResetModal = React.createClass({
    },
    render() {
        return (
-            <Modal {...this.props.options} show={this.props.show} onHide={this.props.onClose}>
+            <Modal
+                container={document.querySelector(".ms2 > #container") }


Please remove container

MV88 · 2017-04-03T09:29:11Z

web/client/components/buttons/__tests__/FullScreenButton-test.jsx

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2015, GeoSolutions Sas.
+ * All rights reserved.


2015 to 2017

MV88 · 2017-04-03T09:30:02Z

web/client/plugins/FullScreen.jsx

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2016, GeoSolutions Sas.
+ * All rights reserved.


MV88 · 2017-04-03T09:30:07Z

web/client/epics/fullscreen.js

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2016, GeoSolutions Sas.
+ * All rights reserved.


same here --> 2017

coveralls · 2017-04-03T10:21:54Z

Coverage increased (+0.06%) to 77.244% when pulling be677d2 on offtherailz:fullscreen into 421a8af on geosolutions-it:master.

offtherailz added the pending review label Mar 24, 2017

mbarto suggested changes Mar 24, 2017

View reviewed changes

mbarto previously requested changes Mar 24, 2017

View reviewed changes

Fix geosolutions-it#1931. Implemented full screen

1a20d1e

- Full screen button added to desktop, embedded and mobile versions - Now all modals and dialogs work in embedded and fullscreen mode - Review of zoomto icon (too similar to full screen) - Added tutorial step for fullscreen button

offtherailz force-pushed the fullscreen branch from 7079bf5 to 1a20d1e Compare March 31, 2017 16:27

offtherailz requested a review from mbarto March 31, 2017 16:27

Merge branch 'master' into fullscreen

c8e8d2a

get themePrevix to get the correct div

ffcc66e

mbarto approved these changes Apr 3, 2017

View reviewed changes

MV88 requested changes Apr 3, 2017

View reviewed changes

Fixed copyright year

be677d2

MV88 approved these changes Apr 3, 2017

View reviewed changes

offtherailz merged commit 7ac597b into geosolutions-it:master Apr 3, 2017

offtherailz removed the pending review label Apr 3, 2017

offtherailz changed the title ~~Fix #1931. Implemented full screen button~~ Fix #1631. Implemented full screen button Apr 4, 2017

offtherailz mentioned this pull request Apr 4, 2017

Provide a full screen button plugin #1631

Closed

offtherailz deleted the fullscreen branch July 18, 2018 16:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #1631. Implemented full screen button #1638

Fix #1631. Implemented full screen button #1638

offtherailz commented Mar 24, 2017 •

edited

Loading

mbarto Mar 24, 2017

mbarto Mar 24, 2017

mbarto Mar 24, 2017

mbarto left a comment

mbarto Mar 31, 2017

mbarto Mar 31, 2017

mbarto Mar 31, 2017

mbarto Mar 31, 2017

mbarto Mar 31, 2017

mbarto Mar 31, 2017

MV88 Apr 3, 2017

MV88 Apr 3, 2017

MV88 Apr 3, 2017

coveralls commented Apr 3, 2017

Fix #1631. Implemented full screen button #1638

Fix #1631. Implemented full screen button #1638

Conversation

offtherailz commented Mar 24, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mbarto left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Apr 3, 2017

offtherailz commented Mar 24, 2017 •

edited

Loading