fixed bug - removing settings property - closes #49

Author: justenPalmer

src/model/Mlayer.js

@@ -121,16 +121,16 @@ export default {
 		});
 	},
 
-	removeIn:function(layerId,key){
+	removeIn:function(layerId,prop){
 		return new Promise((resolve,reject)=>{
 			if (!layerId) return reject('no layerId');
 
-			// clear out key, if is a list (expression), clear out expression
+			// clear out prop, if is a list (expression), clear out expression
 
 			Store.dispatch({
 				type:'LAYER_REMOVEIN',
 				layerId:layerId,
-				prop:key,
+				prop:prop,
 				payload:null
 			});
 

src/model/Mstyle.js

@@ -210,6 +210,23 @@ const Mstyle = {
 		});
 	},
 
+	removeIn:function(prop){
+		return new Promise((resolve,reject)=>{
+			if (!prop) return reject('no prop');
+
+			// clear out prop, if is a list (expression), clear out expression
+
+			Store.dispatch({
+				type:'STYLE_REMOVEIN',
+				prop:prop,
+				payload:null
+			});
+
+			Mstyle.save();
+			return resolve();
+		});
+	},
+
 	validate:function(){
 		return new Promise((resolve,reject)=>{
 			const errors = validateStyle(this.getJSforMapbox());

src/reducer/Rstyle.js

@@ -19,6 +19,11 @@ export default function(state = iState, action){
 			});
 			return setUpdated(style);
 		}
+		case 'STYLE_REMOVEIN':{
+			//console.log('style setIn:',action.key,action.payload);
+			const style = state.removeIn(['rec',...action.prop]);
+			return setUpdated(style);
+		}
 		case 'STYLE_SETIN':{
 			//console.log('style setIn:',action.key,action.payload);
 			const style = state.setIn(action.key,action.payload);

src/view/Vlayer/VlayerEditor.jsx

@@ -69,7 +69,7 @@ export default class VlayerEditor extends React.Component {
 			layerSetIn:(pos,val)=>{
 				Mlayer.setIn(layer.get('id'),pos,val);
 			},
-			layerRemoveIn:(pos)=>{
+			removeIn:(pos)=>{
 				Mlayer.removeIn(layer.get('id'),pos);
 			},
 

src/view/Vproperty/index.jsx

@@ -83,7 +83,7 @@ export default class Vproperty extends React.Component {
 			},
 			remove:()=>{
 				const pos = property.name.split('.');
-				handle.layerRemoveIn(pos);
+				handle.removeIn(pos);
 			},
 			dropdownToggle:()=>{
 				if (this.state.dropdownShown) return this.setState({dropdownShown:false});

src/view/Vsetting/index.jsx

@@ -39,6 +39,10 @@ export default class Vsetting extends React.Component {
 			deleteHide:()=>{
 				this.setState({deleteShow:false});
 			},
+			removeIn:(pos)=>{
+				//console.log('Mstyle:',Mstyle);
+				Mstyle.removeIn(pos);
+			},
 			focus:(pos)=>{
 				//console.log('focus:',pos);
 				this.setState({focus:pos});