CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-19 23:14:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

initial commit...hide parts, not entire viewer

Browse Source 
ref #5829
This commit is contained in:
Max Grossman
2019-02-01 11:49:30 -05:00
parent fc7fcd1e29
commit ce8d16a220
5 changed files with 67 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/80_app.css
+2 -1
View File
@@ -264,7 +264,8 @@ div.hide,
form.hide,
button.hide,
a.hide,
li.hide {
li.hide,
canvas.hide {
display: none;
}
modules/services/mapillary.js
+22 -5
View File
@@ -376,7 +376,8 @@ export default {
var wrap = d3_select('#photoviewer')
.classed('hide', false);
var isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size();
var isHidden = wrap.selectAll('.photo-wrapper.mly-wrapper.hide').size() ||
wrap.selectAll('.photo-wrapper.mly-wrapper .hide').size();
if (isHidden && _mlyViewer) {
wrap
@@ -387,6 +388,14 @@ export default {
.selectAll('.photo-wrapper.mly-wrapper')
.classed('hide', false);
wrap
.selectAll('.mapillary-js-interactive')
.classed('hide', false);
wrap
.selectAll('.mapillary-js-dom')
.classed('hide', false);
_mlyViewer.resize();
}
@@ -404,10 +413,16 @@ export default {
var viewer = d3_select('#photoviewer');
if (!viewer.empty()) viewer.datum(null);
viewer
.classed('hide', true)
.selectAll('.photo-wrapper')
.classed('hide', true);
viewer.select('.mapillary-js-interactive')
.classed('hide', true);
viewer.select('.mapillary-js-dom')
.classed('hide', true);
// viewer
// .classed('hide', true)
// .selectAll('.photo-wrapper')
// .classed('hide', true);
d3_selectAll('.viewfield-group, .sequence, .icon-sign')
.classed('currentView', false);
@@ -415,6 +430,8 @@ export default {
return this.setStyles(null, true);
},
removeViewer: function() {
},
parsePagination: parsePagination,
modules/services/openstreetcam.js
+10 -4
View File
@@ -384,6 +384,8 @@ export default {
viewer
.selectAll('.photo-wrapper.osc-wrapper')
.classed('hide', false)
.selectAll('div')
.classed('hide', false);
}
@@ -397,11 +399,15 @@ export default {
var viewer = d3_select('#photoviewer');
if (!viewer.empty()) viewer.datum(null);
viewer
.classed('hide', true)
.selectAll('.photo-wrapper')
.classed('hide', true);
// viewer
// .classed('hide', true)
// .selectAll('.photo-wrapper')
// .classed('hide', true);
viewer
.selectAll('.osc-wrapper > div')
.classed('hide', true);
d3_selectAll('.viewfield-group, .sequence, .icon-sign')
.classed('currentView', false);
modules/services/streetside.js
+28 -6
View File
@@ -722,16 +722,29 @@ export default {
var wrap = d3_select('#photoviewer')
.classed('hide', false);
var isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size();
var isHidden = wrap.selectAll('.photo-wrapper.ms-wrapper.hide').size() ||
wrap.selectAll('.photo-wrapper.ms-wrapper > div.hide').size();
if (isHidden) {
wrap
.selectAll('.photo-wrapper:not(.ms-wrapper)')
.classed('hide', true);
wrap
.selectAll('.photo-wrapper.ms-wrapper')
var msWrap = wrap.selectAll('.photo-wrapper.ms-wrapper');
msWrap
.classed('hide', false)
.selectAll('.pnlm-container')
.classed('hide', false);
msWrap
.select('.photo-controls-wrap')
.classed('hide', false);
msWrap
.selectAll('#divForCanvasWork > canvas')
.classed('hide', false);
}
return this;
@@ -744,9 +757,18 @@ export default {
var viewer = d3_select('#photoviewer');
if (!viewer.empty()) viewer.datum(null);
viewer
.classed('hide', true)
.selectAll('.photo-wrapper')
var msWrap = viewer.selectAll('.photo-wrapper.ms-wrapper');
msWrap
.select('.photo-controls-wrap')
.classed('hide', true);
msWrap
.selectAll('.pnlm-container')
.classed('hide', true);
msWrap
.selectAll('#divForCanvasWork > canvas')
.classed('hide', true);
d3_selectAll('.viewfield-group, .sequence, .icon-sign')
modules/svg/mapillary_signs.js
+5
View File
@@ -40,6 +40,11 @@ export function svgMapillarySigns(projection, context, dispatch) {
function hideLayer() {
var service = getService();
if (service) {
service.hideViewer();
}
throttledRedraw.cancel();
editOff();
}