Improved source map option

Author: sanex3339

App/actions/index.js

@@ -56,7 +56,7 @@ export const resetOptions = () => {
         dispatch({
             'type': types.RESET_OPTIONS,
         });
-        setOptionsPreset(OPTIONS_PRESET_DEFAULT);
+        dispatch(setOptionsPreset(OPTIONS_PRESET_DEFAULT));
     };
 };
 

App/constants/ActionTypes.js

@@ -19,6 +19,7 @@ export const TOGGLE_DISABLE_CONSOLE_OUTPUT = 'TOGGLE_DISABLE_CONSOLE_OUTPUT';
 export const TOGGLE_DEBUG_PROTECTION = 'TOGGLE_DEBUG_PROTECTION';
 export const TOGGLE_DEBUG_PROTECTION_INTERVAL = 'TOGGLE_DEBUG_PROTECTION_INTERVAL';
 
+export const TOGGLE_SOURCEMAP = 'TOGGLE_SOURCEMAP';
 export const SET_SOURCEMAP_MODE = 'SET_SOURCEMAP_MODE';
 export const SET_SOURCEMAP_BASE_URL = 'SET_SOURCEMAP_BASE_URL';
 export const SET_SOURCEMAP_FILE_NAME = 'SET_SOURCEMAP_FILE_NAME';

App/containers/OptionsContainer.js

@@ -22,12 +22,10 @@ const OPTIONS_PRESET_OPTIONS = [
     {text: 'high', value: OPTIONS_PRESET_HIGH_OBFUSCATION},
 ];
 
-export const SOURCEMAP_OFF = 'off';
 export const SOURCEMAP_INLINE = 'inline';
 export const SOURCEMAP_SEPARATE = 'separate';
 
 const SOURCEMAP_OPTIONS = [
-    {text: 'Off', value: SOURCEMAP_OFF},
     {text: 'Inline', value: SOURCEMAP_INLINE},
     {text: 'Separate', value: SOURCEMAP_SEPARATE},
 ];
@@ -214,7 +212,7 @@ const Options = ({dispatch, options}) => {
                             value={options.stringArrayThreshold}
                             min="0"
                             max="1"
-                            step="0.1"
+                            step="0.05"
                             onChange={(event, {value}) => dispatch(actions.setStringArrayThreshold(parseFloat(value)))}
                             disabled={!options.stringArrayThresholdEnabled}/>
 
@@ -319,23 +317,29 @@ const Options = ({dispatch, options}) => {
                 <Grid.Column>
                     <Segment basic>
 
+                        <Form.Checkbox
+                            label='Enable Source Map'
+                            checked={options.sourceMap}
+                            onChange={() => dispatch(actions.toggleOption(types.TOGGLE_SOURCEMAP))}/>
+
                         <Form.Select
-                            label='Sourcemaps'
+                            label='Source Map Mode'
                             value={options.sourceMapMode}
+                            disabled={!options.sourceMap}
                             fluid
                             onChange={(event, {value}) => dispatch(actions.setSourceMapMode(value))}
                             options={SOURCEMAP_OPTIONS}/>
 
                         <Form.Input
                             label='Source Map Base URL'
-                            disabled={!options.sourceMapSeparate}
+                            disabled={!options.sourceMap || options.sourceMapMode !== SOURCEMAP_SEPARATE}
                             onChange={(event, {value}) => dispatch(actions.setSourceMapBaseUrl(value))}
                             value={options.sourceMapBaseUrl}
                             placeholder='http://localhost:3000'/>
 
                         <Form.Input
                             label='Source Map File Name'
-                            disabled={!options.sourceMapSeparate}
+                            disabled={!options.sourceMap || options.sourceMapMode !== SOURCEMAP_SEPARATE}
                             onChange={(event, {value}) => dispatch(actions.setSourceMapFileName(value))}
                             value={options.sourceMapFileName}
                             placeholder='example'/>

App/reducers/options.js

@@ -36,7 +36,7 @@ const initialState = {
 
     simplify: true,
 
-    stringArrayThreshold: 0.8,
+    stringArrayThreshold: 0.75,
     stringArrayThresholdEnabled: true,
 
     stringArrayEncoding: [
@@ -47,10 +47,9 @@ const initialState = {
     numbersToExpressions: false,
 
     sourceMap: false,
-    sourceMapMode: SOURCEMAP_OFF,
+    sourceMapMode: SOURCEMAP_SEPARATE,
     sourceMapBaseUrl: '',
     sourceMapFileName: '',
-    sourceMapSeparate: false,
 
     domainLock: [],
     domainLockEnabled: true,
@@ -203,13 +202,18 @@ export const options = (state = initialState, action) => {
                 stringArrayThreshold: action.threshold
             };
 
+        case types.TOGGLE_SOURCEMAP: {
+            return {
+                ...state,
+                sourceMap: !state.sourceMap
+            };
+        }
+
         case types.SET_SOURCEMAP_MODE: {
             const mode = action.mode;
             return {
                 ...state,
-                sourceMap: mode !== SOURCEMAP_OFF,
-                sourceMapMode: mode,
-                sourceMapSeparate: mode === SOURCEMAP_SEPARATE
+                sourceMapMode: mode
             };
         }