cleanup and finalize release

manifest.json

@@ -1,4 +1,5 @@
 {
+    "key":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv7ZULSqbpKKQ1QP5Tb9f8g306PlY87OYYlXBrp7PlBHd/LJMUBDNWMCrWhpFR8sIjpvHjYipDr60j+2i7vj3PZlwbxZ7e3x+2A4cQt1LaC1PVZ6avnbsV0YMkFQi8H5f7NQiBKE2i2/Z/kB2r/DzyiUdGW63/sgjpBvgDCCMysHl3NWCnHqIOOtGD8SFlT5clgNJgVOgosFwHE4yYJDpIkvJ+nrLia9v6V/Cyc8ITEd0njvsp0q0aFJp332Ua/RPvh/m1UKcj8f3FNbaCrdScFzfKo5UNmifKLGhT377xhnvhOKuEJbyghNkPheMUquwVpTEHdRFMm7nVcLAt/kuZwIDAQAB",
     "name": "Web Server for Chrome(dev)",
     "short_name": "Web Server(dev)",
     "description": "A Web Server for Chrome, serves web pages from a local folder over the network, using HTTP. Runs offline.",

manifest.json.scratch

@@ -1 +1,2 @@
-    "key":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv7ZULSqbpKKQ1QP5Tb9f8g306PlY87OYYlXBrp7PlBHd/LJMUBDNWMCrWhpFR8sIjpvHjYipDr60j+2i7vj3PZlwbxZ7e3x+2A4cQt1LaC1PVZ6avnbsV0YMkFQi8H5f7NQiBKE2i2/Z/kB2r/DzyiUdGW63/sgjpBvgDCCMysHl3NWCnHqIOOtGD8SFlT5clgNJgVOgosFwHE4yYJDpIkvJ+nrLia9v6V/Cyc8ITEd0njvsp0q0aFJp332Ua/RPvh/m1UKcj8f3FNbaCrdScFzfKo5UNmifKLGhT377xhnvhOKuEJbyghNkPheMUquwVpTEHdRFMm7nVcLAt/kuZwIDAQAB",
+// this is the production app key
+"key":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv7ZULSqbpKKQ1QP5Tb9f8g306PlY87OYYlXBrp7PlBHd/LJMUBDNWMCrWhpFR8sIjpvHjYipDr60j+2i7vj3PZlwbxZ7e3x+2A4cQt1LaC1PVZ6avnbsV0YMkFQi8H5f7NQiBKE2i2/Z/kB2r/DzyiUdGW63/sgjpBvgDCCMysHl3NWCnHqIOOtGD8SFlT5clgNJgVOgosFwHE4yYJDpIkvJ+nrLia9v6V/Cyc8ITEd0njvsp0q0aFJp332Ua/RPvh/m1UKcj8f3FNbaCrdScFzfKo5UNmifKLGhT377xhnvhOKuEJbyghNkPheMUquwVpTEHdRFMm7nVcLAt/kuZwIDAQAB",

package.sh

@@ -2,4 +2,6 @@ rm package.zip
 
 #zip package.zip -r * -x package.sh -x *.git* -x "*.*~" -x images/cws_*.png -x *.scratch -x polymer-ui/node-modules/**\* -x wsc-chrome.min.js
 
-zip package.zip manifest.json *.js *.html images/200*.png polymer-ui/*.html polymer-ui/*.js polymer-ui/*.css polymer-ui/bower_components/font-roboto/fonts/roboto/Roboto-Bold.ttf -x wsc-chrome.min.js
+#zip package.zip manifest.json *.js *.html images/200*.png polymer-ui/*.html polymer-ui/*.js polymer-ui/*.css polymer-ui/bower_components/font-roboto/fonts/roboto/Roboto-Bold.ttf -x wsc-chrome.min.js
+
+zip package.zip manifest.json *.js *.html images/200*.png react-ui/*.html react-ui/nojsx/* assets/* -x wsc-chrome.min.js

react-ui/js/index.js

@@ -33,87 +33,39 @@ const theme = createMuiTheme({
 });
 
 
-// these arent tested yet
 const functions = {
   optVerbose: function(app, k, val) {
     const {bg} = app;
     bg.WSC.VERBOSE = bg.WSC.DEBUG = val
-  },
-	optVerboseChange: function(val) {
-		var k = 'optVerbose'
-		this.updateAndSave(k,val)
-    bg.WSC.VERBOSE = bg.WSC.DEBUG = val
-	},
-	updateAndSave: function(k,v) {
-		console.log('update and save',k,v)
-		webapp.updateOption(k,v)
-		appOptions.set(k,v)
-	},
-  Ready: function() {
-    console.log('wsc-options ready')
-		window.opts = this
-  },
-  portmapChange: function(val) {
-    console.log('persist setting portmapping',val)
-    webapp.updateOption('optDoPortMapping',val)
-    appOptions.set('optDoPortMapping',val)
   },
   optAllInterfaces: function(app, k, val) {
-    const {webapp} = app;
-    webapp.interfaces = []
+    app.webapp.interfaces = []
   },
-  interfaceChange: function(val) {
-    console.log('persist setting interface',val)
-    webapp.opts.optAllInterfaces = val
-    webapp.interfaces = []
-    appOptions.set('optAllInterfaces',val)
+  optIPV6: function(app, k, val) {
+    // reset the list of interfaces
+    app.webapp.interfaces = []
   },
   optPreventSleep: function(app, k, val) {
-    const {webapp} = app;
-    webapp.updatedSleepSetting()
+    // do it after the setting is changed
+    setTimeout(() => {
+      app.webapp.updatedSleepSetting()
+    }, 1);
   },
-  preventSleepChange: function(val) {
-    console.log('persist setting prevent sleep',val)
-    webapp.opts.optPreventSleep = val
-    webapp.updatedSleepSetting()
-    appOptions.set('optPreventSleep',val)
-  },
-  autoStartChange: function(val) {
-    console.log('persist setting autostart')
-    appOptions.set('optAutoStart', val)
-    bg.backgroundSettingChange({'optAutoStart':val})
-  },
-  // backgroundChange: function(val) {
   optBackground: function(app, k, val) {
     const {webapp, bg} = app;
     console.log('background setting changed',val)
 		webapp.updateOption('optBackground',val)
     // appOptions.set('optBackground', val)
     bg.backgroundSettingChange({'optBackground':val})
   },
-  optRenderIndexChange: function(val) {
-    console.log('persist setting renderIndex')
-    webapp.opts.optRenderIndex = val
-    appOptions.set('optRenderIndex',val)
-  },
   port: (app, k, v) => {
     console.log('persist port', v)
+    console.assert(typeof v === 'number')
     app.webapp.opts.port = v
-    app.webapp.port = v
-  },
-  onPortChange: function() {
-		var val = this.port
-    var port = parseInt(val)
-    console.log('persist port',port)
-    webapp.opts.port = port
-    webapp.port = port
-    appOptions.set('port',port)
+    app.webapp.port = v // does it still need to be set here?
   },
-	// onClickStartBackground: function(evt) {
   optAutoStart: function(app, k, val) {
-    // get existing value
     const {bg, webapp} = app;
-		// var val = this.$$('#start-background').active
 		if (val) {
 			chrome.permissions.request({permissions:['background']}, function(result) {
 				console.log('request perm bg',result)
@@ -130,7 +82,6 @@ const functions = {
 		function success() {
 			console.log('persist setting start in background',val)
 			webapp.opts.optBackground = val
-			// appOptions.set('optBackground',val)
 			bg.backgroundSettingChange({'optBackground':val})
 		}
 	}
@@ -343,7 +294,6 @@ class App extends React.Component {
           </FormGroup>
 
           <div>
-
             <Button variant="contained" onClick={this.choose_folder.bind(this)}>Choose Folder</Button>
             <span>{state.folder ? ` Current: ${state.folder}` : 'NO FOLDER SELECTED'}</span>
           </div>

react-ui/js/options.js

@@ -2,6 +2,7 @@ const { FormControlLabel } = MaterialUI
 const { FormGroup } = MaterialUI
 const {
   Switch,
+  Checkbox,
   Tooltip,
   TextField,
 } = MaterialUI
@@ -54,7 +55,7 @@ export function AppOption({disabled, indent, name, value, appOptions, onChange:
             <FormControlLabel
               label={meta.label}
               control={(
-                <Switch
+                <Checkbox
                   disabled={disabled}
                            checked={!!value}
                            onChange={onChange}

webapp.js

@@ -336,7 +336,7 @@
             this.urls.push({url:'http://127.0.0.1:' + this.port})
             for (var i=0; i<this.interfaces.length; i++) {
                 var iface = this.interfaces[i]
-                if (iface.prefixLength > 24) {
+                if (iface.prefixLength === 64) {
                     this.urls.push({url:'http://['+iface.address+']:' + this.port})
                 } else {
                     this.urls.push({url:'http://'+iface.address+':' + this.port})
@@ -401,7 +401,7 @@
                 console.log('network interfaces',result)
                 if (result) {
                     for (var i=0; i<result.length; i++) {
-                        if (this.opts.optIPV6 || result[i].prefixLength <= 24) {
+                        if (this.opts.optIPV6 || result[i].prefixLength >= 24) {
                             if (result[i].address.startsWith('fe80::')) { continue }
                             this.interfaces.push(result[i])
                             console.log('found interface address: ' + result[i].address)