From 6975ea770b29e2cfafe5ee78aeb343ed2c1d2a9a Mon Sep 17 00:00:00 2001
From: Eric Gibby <eric.gibby@imaginelearning.com>
Date: Tue, 21 Mar 2017 15:26:41 -0600
Subject: [PATCH 1/2] IL-15906: Get URL of launching page so parameters can be
 passed to packaged app.

---
 background.js    | 505 ++++++++++++++++++++++++-----------------------
 browser.js       | 286 +++++++++++++--------------
 manifest.json    |   8 +-
 parseSettings.js |  44 ++---
 4 files changed, 433 insertions(+), 410 deletions(-)

diff --git a/background.js b/background.js
index 25ea587..d5e2aec 100644
--- a/background.js
+++ b/background.js
@@ -5,135 +5,137 @@ var HADEVENT = false
 var OS
 var localOptions
 if (navigator.userAgent.match('OS X')) {
-    OS = 'Mac'
+	OS = 'Mac'
 } else if (navigator.userAgent.match("Windows")) {
-    OS = "Win"
+	OS = "Win"
 } else {
-    OS = "Chrome"
+	OS = "Chrome"
 }
 
 function onchoosefolder(entry) {
-    if (entry) {
-        var retainstr = chrome.fileSystem.retainEntry(entry)
-        var d = {'retainstr':retainstr}
-        chrome.storage.local.set(d)
-        console.log('set retainstr!')
-        var webapp = get_webapp()
-        if (webapp) {
-            var fs = new WSC.FileSystem(entry)
-            webapp.fs = fs
-            webapp.handlers = []
-            webapp.add_handler(['.*',WSC.DirectoryEntryHandler.bind(null,fs)])
-            webapp.init_handlers()
-            webapp.change()
-        }
-        // reload UI, restart server... etc
-    }
+	if (entry) {
+		var retainstr = chrome.fileSystem.retainEntry(entry)
+		var d = { 'retainstr': retainstr }
+		chrome.storage.local.set(d)
+		console.log('set retainstr!')
+		var webapp = get_webapp()
+		if (webapp) {
+			var fs = new WSC.FileSystem(entry)
+			webapp.fs = fs
+			webapp.handlers = []
+			webapp.add_handler(['.*', WSC.DirectoryEntryHandler.bind(null, fs)])
+			webapp.init_handlers()
+			webapp.change()
+		}
+		// reload UI, restart server... etc
+	}
 }
 
 function settings_ready(d) {
-    localOptions = d
-	console.log('settings:',d)
-	setTimeout( maybeStartup, 2000 ) // give background accept handler some time to trigger
-    //chrome.alarms.getAll( onAllAlarms )
+	localOptions = d
+	console.log('settings:', d)
+	setTimeout(maybeStartup, 2000) // give background accept handler some time to trigger
+	//chrome.alarms.getAll( onAllAlarms )
 }
 chrome.storage.local.get(null, settings_ready)
 
 function maybeStartup() {
 	if (getting_settings) { return } // accept handler
 	if (had_backgroundaccept) { return }
-    if (localOptions.optBackground && localOptions.optAutoStart) {
-        console.log('background && autostart. wake up!')
-        get_webapp(localOptions)
-        if (app.started || app.starting || app.starting_interfaces) {
-            console.log('actually, dont wake up, im already started/starting')
-        } else {
-            app.start()
-        }
-    }
+	if (localOptions.optBackground && localOptions.optAutoStart) {
+		console.log('background && autostart. wake up!')
+		get_webapp(localOptions)
+		if (app.started || app.starting || app.starting_interfaces) {
+			console.log('actually, dont wake up, im already started/starting')
+		} else {
+			app.start()
+		}
+	}
 }
-function onAlarm( alarm ) {
-    console.log('alarm fired',alarm)
-    if (alarm.name == ALARMID) {
-        //sendWSCAwakeMessage()
-    }
+function onAlarm(alarm) {
+	console.log('alarm fired', alarm)
+	if (alarm.name == ALARMID) {
+		//sendWSCAwakeMessage()
+	}
 }
 
 //chrome.alarms.onAlarm.addListener( onAlarm )
-function backgroundSettingChange( opts ) {
-    if (opts.optBackground !== undefined) {
-        localOptions.optBackground = opts.optBackground
-    }
-    if (opts.optPreventSleep !== undefined) {
-        localOptions.optPreventSleep = opts.optPreventSleep
-    }
-    if (opts.optBackground !== undefined) {
-        localOptions.optAutoStart = opts.optAutoStart
-    }
+function backgroundSettingChange(opts) {
+	if (opts.optBackground !== undefined) {
+		localOptions.optBackground = opts.optBackground
+	}
+	if (opts.optPreventSleep !== undefined) {
+		localOptions.optPreventSleep = opts.optPreventSleep
+	}
+	if (opts.optBackground !== undefined) {
+		localOptions.optAutoStart = opts.optAutoStart
+	}
 	/*
-    if (localOptions.optBackground && localOptions.optAutoStart) {
-        chrome.alarms.getAll( onAllAlarms )
-    } else {
-        chrome.alarms.clearAll()
-    }*/
+	if (localOptions.optBackground && localOptions.optAutoStart) {
+		chrome.alarms.getAll( onAllAlarms )
+	} else {
+		chrome.alarms.clearAll()
+	}*/
 }
-function onAllAlarms( alarms ) {
+function onAllAlarms(alarms) {
 	return
-    if (! localOptions.optBackground) {
-        return
-    }
-    if (! localOptions.optAutoStart) {
-        return
-    }
-    var found = false
-    
-    console.log('got alarms',alarms)
-    for (var i=0; i<alarms.length; i++) {
-        if (alarms[i].name == ALARMID) {
-            found = true
-        }
-    }
-    if (! found) {
-        console.log('created periodic alarm')
-        chrome.alarms.create(ALARMID, {'periodInMinutes':1})
-    }
-    // also fire the callback/alarm thing sooner, perhaps...
-    console.log('also fire alarm now?')
-    sendWSCAwakeMessage()
+	if (!localOptions.optBackground) {
+		return
+	}
+	if (!localOptions.optAutoStart) {
+		return
+	}
+	var found = false
+
+	console.log('got alarms', alarms)
+	for (var i = 0; i < alarms.length; i++) {
+		if (alarms[i].name == ALARMID) {
+			found = true
+		}
+	}
+	if (!found) {
+		console.log('created periodic alarm')
+		chrome.alarms.create(ALARMID, { 'periodInMinutes': 1 })
+	}
+	// also fire the callback/alarm thing sooner, perhaps...
+	console.log('also fire alarm now?')
+	sendWSCAwakeMessage()
 }
 
 
-chrome.runtime.onStartup.addListener( function(evt) {
+chrome.runtime.onStartup.addListener(function (evt) {
 	HADEVENT = true
-    // should fire when profile loads up...
+	// should fire when profile loads up...
 
-    // (needs "background" permission)
-    window.ONSTARTUP_FIRED = true
-    console.log('onStartup',evt)
+	// (needs "background" permission)
+	window.ONSTARTUP_FIRED = true
+	console.log('onStartup', evt)
 })
 function createNotification(msg, prio) {
-//    if (prio === undefined) { prio = 0 }
-    var opts = {type:"basic",
-                title:msg,
-//                priority:prio,
-                iconUrl:'/images/200ok-256.png',
-                message:msg}
-    chrome.notifications.create( "suspending", opts, function(){} )
+	//    if (prio === undefined) { prio = 0 }
+	var opts = {
+		type: "basic",
+		title: msg,
+		//                priority:prio,
+		iconUrl: '/images/200ok-256.png',
+		message: msg
+	}
+	chrome.notifications.create("suspending", opts, function () { })
 }
 
 function triggerKeepAwake() {
-    //createNotification('WebServer') // creating a notification also works, but is annoying
-
-    // HACK: make an XHR to cause onSuspendCanceled event
-    console.log('triggerKeepAwake')
-    var xhr = new XMLHttpRequest
-    xhr.open("GET","http://127.0.0.1:" + (localOptions.port || 8887) + '/dummyUrlPing')
-    function onload(evt) {
-        console.log('triggerKeepAwake XHR loaded',evt)
-    }
-    xhr.onerror = onload
-    xhr.onload = onload
-    xhr.send()
+	//createNotification('WebServer') // creating a notification also works, but is annoying
+
+	// HACK: make an XHR to cause onSuspendCanceled event
+	console.log('triggerKeepAwake')
+	var xhr = new XMLHttpRequest
+	xhr.open("GET", "http://127.0.0.1:" + (localOptions.port || 8887) + '/dummyUrlPing')
+	function onload(evt) {
+		console.log('triggerKeepAwake XHR loaded', evt)
+	}
+	xhr.onerror = onload
+	xhr.onload = onload
+	xhr.send()
 }
 
 chrome.sockets.tcpServer.onAccept.addListener(backgroundAccept)
@@ -143,14 +145,14 @@ var had_backgroundaccept = false
 function backgroundAccept(sockInfo) {
 	console.log('background onaccept')
 	had_backgroundaccept = true
-    if (window.webapp && webapp.started) {
-        return // app registered an accept handler.
-    }
+	if (window.webapp && webapp.started) {
+		return // app registered an accept handler.
+	}
 	HADEVENT = true
-	
-    bgacceptqueue.push(sockInfo)
-    
-    if (getting_settings) return
+
+	bgacceptqueue.push(sockInfo)
+
+	if (getting_settings) return
 
 	if (localOptions) {
 		console.log('already had settings')
@@ -160,12 +162,12 @@ function backgroundAccept(sockInfo) {
 		console.log('getting settings')
 		chrome.storage.local.get(null, onsettings)
 	}
-    
+
 	function onsettings(d) {
 		getting_settings = false
 		localOptions = d
 		console.log('starting...')
-		get_webapp(d).start( function(result) {
+		get_webapp(d).start(function (result) {
 			console.log('started.')
 			webapp.acceptQueue = bgacceptqueue
 			bgacceptqueue = []
@@ -174,84 +176,102 @@ function backgroundAccept(sockInfo) {
 	}
 }
 
-chrome.runtime.onSuspend.addListener( function(evt) {
-    //createNotification("onSuspend")
-    console.warn('onSuspend')
-    return
+chrome.runtime.onSuspend.addListener(function (evt) {
+	//createNotification("onSuspend")
+	console.warn('onSuspend')
+	return
 
 	// using a persistent socket now...
-    if (localOptions.optBackground) {
-        triggerKeepAwake()
-    } else {
-        if (window.app) app.stop('onsuspend')
-    }
+	if (localOptions.optBackground) {
+		triggerKeepAwake()
+	} else {
+		if (window.app) app.stop('onsuspend')
+	}
 })
-chrome.runtime.onSuspendCanceled.addListener( function(evt) {
-    //createNotification("suspendcanceled!")
-    console.warn('onSuspendCanceled')
+chrome.runtime.onSuspendCanceled.addListener(function (evt) {
+	//createNotification("suspendcanceled!")
+	console.warn('onSuspendCanceled')
 })
 
 function launch(launchData) {
 	HADEVENT = true
 
-    launchData = launchData || {}
-    //if (launchData.source == 'reload') { console.log('app was reloaded'); return }
-    if (launchData.source == 'restart') { console.log('chrome restarted'); return }
-
-    //console.log('onLaunched with launchdata',launchData)
-
-    var info = {type:'onLaunched',
-                launchData: launchData}
-    var opts = {id:'index',
-				outerBounds: { width: 410,
-							   height: 700 }
-			   }
-    //var page = 'index.html'
-    var page = 'browser.html';
-    
-    
-    //launch our app directly here
-    
-      var screenWidth = screen.availWidth;
-      var screenHeight = screen.availHeight;
-      var width = screenWidth;
-      var height = screenHeight;
-      
-      chrome.app.window.create(page, 
-      {
-        outerBounds: {
-        width: width,
-        height: height,
-        
-        }
-      },
-      function(mainWindow) {
-                                 window.mainWindow = mainWindow;
-                                 mainWindow.onClosed.addListener( window_closed )
-                                 var hiddenwin = chrome.app.window.get('hidden')
-                                 if (hiddenwin) { hiddenwin.close() }
-                                 
-			 });
-    
-
-    if (window.app) { console.log('already have webapp',app); return }
+	launchData = launchData || {}
+	//if (launchData.source == 'reload') { console.log('app was reloaded'); return }
+	if (launchData.source == 'restart') { console.log('chrome restarted'); return }
+
+	//console.log('onLaunched with launchdata',launchData)
+
+	// If launched via a url_handler, we need to grab data passed through the URL.
+	// We only want the data that comes after the base URL, specified by the ID
+	// of the url_handler.
+	var relativeUrl;
+	if (launchData.source === 'url_handler' && launchData.url && launchData.id) {
+		var regex = new RegExp('^http[s]?:\/\/' + launchData.id, 'i');
+		relativeUrl = launchData.url.replace(regex, '');
+	}
+
+	// If we identified a relative URL from the url_handler, we'll stuff
+	// it in local storage to be retrieved when the app launches.
+	if (relativeUrl) {
+		chrome.storage.local.set({ relativeLaunchUrl: relativeUrl }, launchApp);
+	} else {
+		// Otherwise clear it out
+		chome.storage.local.remove('relativeLaunchUrl', launchApp);
+	}
+
+	function launchApp() {
+		var info = {
+			type: 'onLaunched',
+			launchData: launchData
+		}
+		var opts = {
+			id: 'index',
+			outerBounds: {
+				width: 410,
+				height: 700
+			}
+		}
+		//var page = 'index.html'
+		var page = 'browser.html';
+
+		var screenWidth = screen.availWidth;
+		var screenHeight = screen.availHeight;
+		var width = screenWidth;
+		var height = screenHeight;
+
+		chrome.app.window.create(page, {
+			outerBounds: {
+				width: width,
+				height: height
+			}
+		}, function (mainWindow) {
+			window.mainWindow = mainWindow;
+			mainWindow.onClosed.addListener(window_closed)
+			var hiddenwin = chrome.app.window.get('hidden')
+			if (hiddenwin) { hiddenwin.close() }
+
+		});
+
+		if (window.app) { console.log('already have webapp', app); return }
+	}
 
 }
 
 function teststart() {
-    var opts = {}
-    opts.port = 8887
-    opts.optAllInterfaces = true
-    opts.optTryOtherPorts = true
-    opts.optRetryInterfaces = true
+	var opts = {}
+	opts.port = 8887
+	opts.optAllInterfaces = true
+	opts.optTryOtherPorts = true
+	opts.optRetryInterfaces = true
 	opts.handlers = []
-    window.webapp = new WSC.WebApplication(opts)
+	window.webapp = new WSC.WebApplication(opts)
 	webapp.add_handler(['.*', WSC.ExampleWebSocketHandler])
 	webapp.init_handlers()
-    webapp.start( function(result) { console.log('webapp start result',result) } )
+	webapp.start(function (result) { console.log('webapp start result', result) })
 }
 
-chrome.runtime.onInstalled.addListener( function() {
+chrome.runtime.onInstalled.addListener(function () {
 	HADEVENT = true
 	//teststart()
 })
@@ -259,102 +279,103 @@ chrome.runtime.onInstalled.addListener( function() {
 chrome.app.runtime.onLaunched.addListener(launch);
 
 function get_webapp(opts) {
-    if (! window.app) {
-        window.app = new WSC.WebApplication(opts)
+	if (!window.app) {
+		window.app = new WSC.WebApplication(opts)
 		window.webapp = app
-    }
-    return window.app
+	}
+	return window.app
 }
 
 
 function get_status() {
-    // gets current status of web server
-    var status = {}
-    if (window.app) {
-        status.app = app
-        status.created = true
-    } else {
-        status.created = false
-    }
-    return status
+	// gets current status of web server
+	var status = {}
+	if (window.app) {
+		status.app = app
+		status.created = true
+	} else {
+		status.created = false
+	}
+	return status
 }
 
 function start_app() {
-    if (app) { app.start() }
+	if (app) { app.start() }
 }
 function stop_app() {
-    if (window.app) { app.stop() }
+	if (window.app) { app.stop() }
 }
 
 function hidden_click_configure() {
-    // user clicked on the help info thing in the hidden page.
-    launch({source:"hidden_window"})
+	// user clicked on the help info thing in the hidden page.
+	launch({ source: "hidden_window" })
 }
 
 function create_hidden() {
-    if (OS != 'Chrome') { return }
-
-    if (app.opts && app.opts.optBackground && app.opts.optAllInterfaces) {
-        console.log('creating hidden window')
-        var W = 300
-        var H = 120
-        function oncreated(win) {
-            // can also set width/top etc properties directly
-            win.outerBounds.setPosition(screen.width - W, screen.availHeight - H - 60)
-            win.outerBounds.setSize(W, H)
-            win.show()
-            win.minimize()
-            win.onClosed.addListener( function() {
-                // depends on WHY we are closed...
-                var wins = chrome.app.window.getAll()
-                if (app.opts && app.opts.optBackground) {
-
-                    if ( (wins.length == 1 && win.id == 'hidden') ||
-                         wins.length == 0) {
-                        setTimeout( function() {
-                            create_hidden()
-                        }, 1000 )
-                    }
-                }
-            })
-        }
-        var opts = {id:'hidden',
-                    hidden:true
-                   }
-
-        chrome.app.window.create("hidden.html",
-                                 opts,
-                                 oncreated)
-    }
+	if (OS != 'Chrome') { return }
+
+	if (app.opts && app.opts.optBackground && app.opts.optAllInterfaces) {
+		console.log('creating hidden window')
+		var W = 300
+		var H = 120
+		function oncreated(win) {
+			// can also set width/top etc properties directly
+			win.outerBounds.setPosition(screen.width - W, screen.availHeight - H - 60)
+			win.outerBounds.setSize(W, H)
+			win.show()
+			win.minimize()
+			win.onClosed.addListener(function () {
+				// depends on WHY we are closed...
+				var wins = chrome.app.window.getAll()
+				if (app.opts && app.opts.optBackground) {
+
+					if ((wins.length == 1 && win.id == 'hidden') ||
+						wins.length == 0) {
+						setTimeout(function () {
+							create_hidden()
+						}, 1000)
+					}
+				}
+			})
+		}
+		var opts = {
+			id: 'hidden',
+			hidden: true
+		}
+
+		chrome.app.window.create("hidden.html",
+			opts,
+			oncreated)
+	}
 }
 
 function window_closed(win) {
-    console.log('main window closed')
-    if (window.app) {
-        if (app.opts && app.opts.optBackground) {
-            setTimeout( function() {
-                create_hidden()
-            }, 1)
-
-            console.log('not stopping server, backgrounding mode on');
-            return 
-        }
-    }
-    console.log('main window closed. stopping server')
-    stop_app()
+	console.log('main window closed')
+	if (window.app) {
+		if (app.opts && app.opts.optBackground) {
+			setTimeout(function () {
+				create_hidden()
+			}, 1)
+
+			console.log('not stopping server, backgrounding mode on');
+			return
+		}
+	}
+	console.log('main window closed. stopping server')
+	stop_app()
 }
 
-function restart(port) { 
-    if (window.app) {
-        app.stop();
-        app.port = port;
-        app.start();
-    }
+function restart(port) {
+	if (window.app) {
+		app.stop();
+		app.port = port;
+		app.start();
+	}
 }
 window.reload = chrome.runtime.reload
 
-setTimeout( function() {
-	if (! HADEVENT) {
+setTimeout(function () {
+	if (!HADEVENT) {
 		console.log('background page was manually reloaded in devtools? or resumed from suspended state...')
 		return
 		var testimg = new Image();
@@ -362,7 +383,7 @@ setTimeout( function() {
 		testimg.__defineGetter__('id', devtools_open)
 		console.log(testimg)
 		function maybeRestart() {
-			if (! chrome.runtime.getManifest().update_url) {
+			if (!chrome.runtime.getManifest().update_url) {
 				console.log('running as unpacked app')
 				console.log('reload()')
 				chrome.runtime.reload()
@@ -371,7 +392,7 @@ setTimeout( function() {
 		function devtools_open() {
 			if (triggered) { return }
 			triggered = true
-			setTimeout( maybeRestart, 1 )
+			setTimeout(maybeRestart, 1)
 			return 'test'
 		}
 	}
diff --git a/browser.js b/browser.js
index 7b6879e..41b56ef 100644
--- a/browser.js
+++ b/browser.js
@@ -3,72 +3,72 @@ window.onresize = doLayout;
 var isLoading = false;
 
 function ui_ready() {
-    
-    if (window.webapp) {
-        if (! (webapp.started || webapp.starting)) {
-            // autostart ?
-            webapp.start();
-        }
-    }
+
+	if (window.webapp) {
+		if (!(webapp.started || webapp.starting)) {
+			// autostart ?
+			webapp.start();
+		}
+	}
 }
 function settings_ready(d) {
-    window.localOptions = d;
-    console.log('fetched local settings',d);
-    window.webapp = bg.get_webapp(d);
-    ui_ready();
+	window.localOptions = d;
+	console.log('fetched local settings', d);
+	window.webapp = bg.get_webapp(d);
+	ui_ready();
 }
 
-chrome.runtime.getBackgroundPage( function(bg) {
-    window.bg = bg;
-    chrome.storage.local.get(null, settings_ready);
+chrome.runtime.getBackgroundPage(function (bg) {
+	window.bg = bg;
+	chrome.storage.local.get(null, settings_ready);
 })
 
 
 
-onload = function() {
-  getServerSettings(receivedServerSettings);
-  var webview = document.querySelector('webview');
-  doLayout();
-
-  document.querySelector('#reset').onclick = function() {
-    window.close();
-  };
-
-  document.querySelector('#reload').onclick = function() {
-    if (isLoading) {
-      webview.stop();
-    } else {
-      webview.reload();
-    }
-  };
-  document.querySelector('#reload').addEventListener(
-    'webkitAnimationIteration',
-    function() {
-      if (!isLoading) {
-        document.body.classList.remove('loading');
-      }
-    });
-
-
-  webview.addEventListener('exit', handleExit);
-  webview.addEventListener('loadstart', handleLoadStart);
-  webview.addEventListener('loadstop', handleLoadStop);
-  webview.addEventListener('loadabort', handleLoadAbort);
-  webview.addEventListener('loadredirect', handleLoadRedirect);
-  webview.addEventListener('loadcommit', handleLoadCommit);
-  webview.addEventListener('permissionrequest', handleRequest);
+onload = function () {
+	getServerSettings(receivedServerSettings);
+	var webview = document.querySelector('webview');
+	doLayout();
+
+	document.querySelector('#reset').onclick = function () {
+		window.close();
+	};
+
+	document.querySelector('#reload').onclick = function () {
+		if (isLoading) {
+			webview.stop();
+		} else {
+			webview.reload();
+		}
+	};
+	document.querySelector('#reload').addEventListener(
+		'webkitAnimationIteration',
+		function () {
+			if (!isLoading) {
+				document.body.classList.remove('loading');
+			}
+		});
+
+
+	webview.addEventListener('exit', handleExit);
+	webview.addEventListener('loadstart', handleLoadStart);
+	webview.addEventListener('loadstop', handleLoadStop);
+	webview.addEventListener('loadabort', handleLoadAbort);
+	webview.addEventListener('loadredirect', handleLoadRedirect);
+	webview.addEventListener('loadcommit', handleLoadCommit);
+	webview.addEventListener('permissionrequest', handleRequest);
 };
 
 
 function getServerSettings(callback) {
-	chrome.storage.managed.get("serverSettings",function(results) {
+	chrome.storage.managed.get("serverSettings", function (results) {
 		if (chrome.runtime.lastError) {
 			console.log("error, returning empty. Error Message: " + chrome.runtime.lastError.message);
 			return;
 		} else {
 			console.log("got server settings, returning");
 			callback(results.serverSettings)
-			
+
 		}
 	});
 }
@@ -76,21 +76,21 @@ function getServerSettings(callback) {
 function receivedServerSettings(serverSettings) {
 	console.log("got server settings");
 	console.log(serverSettings);
-	var url = convertServerSettingsToUrl(serverSettings);
-	
-	if (url && url.length > 0) {
-		console.log("calling navigateTo url: " + url);
-		navigateTo(url);
-	}
-	
+	chrome.storage.local.get('relativeLaunchUrl', function (obj) {
+		var relativeLaunchUrl = obj && obj.relativeLaunchUrl,
+			url = convertServerSettingsToUrl(serverSettings, relativeLaunchUrl);
+
+		if (url && url.length > 0) {
+			console.log("calling navigateTo url: " + url);
+			navigateTo(url);
+		}
+	});
 }
 
 
-function handleRequest(e)
-{
+function handleRequest(e) {
 	console.log("permission request");
-	if(e.permission ==='media')
-	{
+	if (e.permission === 'media') {
 		console.log("Audio permission request");
 		e.request.allow();
 	}
@@ -98,123 +98,123 @@ function handleRequest(e)
 }
 
 function navigateTo(url) {
-  resetExitedState();
-  document.querySelector('webview').src = url;
+	resetExitedState();
+	document.querySelector('webview').src = url;
 }
 
 function doLayout() {
-  var webview = document.querySelector('webview');
-  var controls = document.querySelector('#controls');
-  var controlsHeight = controls.offsetHeight;
-  var windowWidth = document.documentElement.clientWidth;
-  var windowHeight = document.documentElement.clientHeight;
-  var webviewWidth = windowWidth;
-  var webviewHeight = windowHeight - controlsHeight;
-
-  webview.style.width = webviewWidth + 'px';
-  webview.style.height = webviewHeight + 'px';
-
-  var sadWebview = document.querySelector('#sad-webview');
-  sadWebview.style.width = webviewWidth + 'px';
-  sadWebview.style.height = webviewHeight * 2/3 + 'px';
-  sadWebview.style.paddingTop = webviewHeight/3 + 'px';
+	var webview = document.querySelector('webview');
+	var controls = document.querySelector('#controls');
+	var controlsHeight = controls.offsetHeight;
+	var windowWidth = document.documentElement.clientWidth;
+	var windowHeight = document.documentElement.clientHeight;
+	var webviewWidth = windowWidth;
+	var webviewHeight = windowHeight - controlsHeight;
+
+	webview.style.width = webviewWidth + 'px';
+	webview.style.height = webviewHeight + 'px';
+
+	var sadWebview = document.querySelector('#sad-webview');
+	sadWebview.style.width = webviewWidth + 'px';
+	sadWebview.style.height = webviewHeight * 2 / 3 + 'px';
+	sadWebview.style.paddingTop = webviewHeight / 3 + 'px';
 }
 
 function handleExit(event) {
-  console.log(event.type);
-  document.body.classList.add('exited');
-  if (event.type == 'abnormal') {
-    document.body.classList.add('crashed');
-  } else if (event.type == 'killed') {
-    document.body.classList.add('killed');
-  }
+	console.log(event.type);
+	document.body.classList.add('exited');
+	if (event.type == 'abnormal') {
+		document.body.classList.add('crashed');
+	} else if (event.type == 'killed') {
+		document.body.classList.add('killed');
+	}
 }
 
 function resetExitedState() {
-  document.body.classList.remove('exited');
-  document.body.classList.remove('crashed');
-  document.body.classList.remove('killed');
+	document.body.classList.remove('exited');
+	document.body.classList.remove('crashed');
+	document.body.classList.remove('killed');
 }
 
 function handleLoadCommit(event) {
-  resetExitedState();
-  if (!event.isTopLevel) {
-    return;
-  }
+	resetExitedState();
+	if (!event.isTopLevel) {
+		return;
+	}
 
 
-  var webview = document.querySelector('webview');
+	var webview = document.querySelector('webview');
 }
 
 function handleLoadStart(event) {
-  document.body.classList.add('loading');
-  isLoading = true;
+	document.body.classList.add('loading');
+	isLoading = true;
 
-  resetExitedState();
-  if (!event.isTopLevel) {
-    return;
-  }
+	resetExitedState();
+	if (!event.isTopLevel) {
+		return;
+	}
 }
 
 var settings = {};
 function handleLoadStop(event) {
-  // We don't remove the loading class immediately, instead we let the animation
-  // finish, so that the spinner doesn't jerkily reset back to the 0 position.
-  isLoading = false;
-  
-  chrome.storage.sync.get(null, function(items){
-    settings = items;
-    
-    var webview = document.querySelector('webview');
-    //by sending this message the webview can then send messages back to the listener added above
+	// We don't remove the loading class immediately, instead we let the animation
+	// finish, so that the spinner doesn't jerkily reset back to the 0 position.
+	isLoading = false;
+
+	chrome.storage.sync.get(null, function (items) {
+		settings = items;
+
+		var webview = document.querySelector('webview');
+		//by sending this message the webview can then send messages back to the listener added above
 		webview.contentWindow.postMessage({
 			command: 'handshake',
 			settings: settings
 		}, '*');
-  });
-  
-  window.addEventListener("message", function(event) {
-			console.log('window received message:', event.data);
-			processCommand(event.data);
-		});
+	});
+
+	window.addEventListener("message", function (event) {
+		console.log('window received message:', event.data);
+		processCommand(event.data);
+	});
 }
 
-function processCommand(data){
-  
-  if (data.command === 'handshakereply'){
-    //ignore because this is just the client telling us it can talk back
-    return;
-  }
-  
-  if (data.command === 'deletePref'){
-    delete settings[data.data.key];
-  }
-  else if (data.command === 'setPref') {
-    settings[data.data.key] = data.data;  
-  }
-  
-  chrome.storage.sync.set(settings, function(){
-    
-    if (!chrome.runtime.lastError) {
-        console.log('settings set');
-    }
-  });
-  
-  
+function processCommand(data) {
+
+	if (data.command === 'handshakereply') {
+		//ignore because this is just the client telling us it can talk back
+		return;
+	}
+
+	if (data.command === 'deletePref') {
+		delete settings[data.data.key];
+	}
+	else if (data.command === 'setPref') {
+		settings[data.data.key] = data.data;
+	}
+
+	chrome.storage.sync.set(settings, function () {
+
+		if (!chrome.runtime.lastError) {
+			console.log('settings set');
+		}
+	});
+
+
 }
 
 function handleLoadAbort(event) {
-  console.log('oadAbort');
-  console.log('  url: ' + event.url);
-  console.log('  isTopLevel: ' + event.isTopLevel);
-  console.log('  type: ' + event.type);
+	console.log('oadAbort');
+	console.log('  url: ' + event.url);
+	console.log('  isTopLevel: ' + event.isTopLevel);
+	console.log('  type: ' + event.type);
 }
 
 function handleLoadRedirect(event) {
-  resetExitedState();
-  if (!event.isTopLevel) {
-    return;
-  }
+	resetExitedState();
+	if (!event.isTopLevel) {
+		return;
+	}
 
-  document.querySelector('#location').value = event.newUrl;
+	document.querySelector('#location').value = event.newUrl;
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 08e672a..8bc1c29 100644
--- a/manifest.json
+++ b/manifest.json
@@ -43,7 +43,13 @@
         "128": "images/il_128.png"
     },
     "url_handlers": {
-        "openApp": {
+        "localhost/player": {
+            "matches": [
+                "*://localhost/player/*"
+            ],
+            "title": "Open Imagine Learning"
+        },
+        "client.imaginelearning.com": {
             "matches": [
                 "*://client.imaginelearning.com/*"
             ],
diff --git a/parseSettings.js b/parseSettings.js
index 0c9dbe9..a6831f4 100644
--- a/parseSettings.js
+++ b/parseSettings.js
@@ -1,37 +1,33 @@
 var baseUrl = "localhost:8887/";
 
 
-function convertServerSettingsToUrl(serverSettings) {
-	if (serverSettings !== undefined && serverSettings !== null) {
-	
-		var protocol = 'http://';
-				
-		var domain = baseUrl;
-				
-		var queryString = '';
-		if (serverSettings && serverSettings.cloudSiteCode && serverSettings.cloudSiteCode.length > 0) {
-			queryString =  '?sitecode=' + serverSettings.cloudSiteCode;
+function convertServerSettingsToUrl(serverSettings, launchUrl) {
+	var url = 'http://' + baseUrl;
+
+	if (launchUrl) {
+		url += launchUrl.replace(/^\//, '');
+	}
+
+	if (serverSettings) {
+		var queryString = [];
+		if (serverSettings && serverSettings.cloudSiteCode && serverSettings.cloudSiteCode.length > 0 && url.indexOf('sitecode') < 0) {
+			queryString.push('sitecode=' + serverSettings.cloudSiteCode);
 		} else if (serverSettings && serverSettings.engineAddress && serverSettings.engineAddress.length > 0) {
-			queryString = '?engineaddress=' + serverSettings.engineAddress;
+			queryString.push('engineaddress=' + serverSettings.engineAddress);
 		}
 		
 		if (serverSettings && serverSettings.forceCloudLogUpload && serverSettings.forceCloudLogUpload === true) {
-			if (queryString === '') {
-				queryString = '?forceCloudLogUpload';
-			} else {
-				queryString = queryString + '&forceCloudLogUpload';
-			}
+			queryString.push('forceCloudLogUpload');
 		}
 
 		if (serverSettings && serverSettings.adaptive && serverSettings.adaptive === true) {
-			if (queryString === '') {
-				queryString = '?adaptive';
-			} else {
-				queryString = queryString + '&adaptive';
-			}
+			queryString.push('adaptive');
+		}
+
+		if (queryString.length) {
+			url += (url.indexOf('?') < 0 ? '?' : '&') + queryString.join('&');
 		}
-		
-		return protocol + domain + queryString;
 	}
-	return '';
+
+	return url;
 }
\ No newline at end of file

From 00798ad43927fdb4af6a35c7556eda058bda02f5 Mon Sep 17 00:00:00 2001
From: Eric Gibby <eric.gibby@imaginelearning.com>
Date: Tue, 21 Mar 2017 15:31:11 -0600
Subject: [PATCH 2/2] IL-15906: Added URL handlers for all environments.

---
 manifest.json | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 8bc1c29..e718bea 100644
--- a/manifest.json
+++ b/manifest.json
@@ -45,7 +45,7 @@
     "url_handlers": {
         "localhost/player": {
             "matches": [
-                "*://localhost/player/*"
+                "*://localhost/player*"
             ],
             "title": "Open Imagine Learning"
         },
@@ -54,6 +54,30 @@
                 "*://client.imaginelearning.com/*"
             ],
             "title": "Open Imagine Learning"
+        },
+        "test.my.imaginelearning.com/player": {
+            "matches": [
+                "*://test.my.imaginelearning.com/player*"
+            ],
+            "title": "Open Imagine Learning"
+        },
+        "rc.my.imaginelearning.com/player": {
+            "matches": [
+                "*://rc.my.imaginelearning.com/player*"
+            ],
+            "title": "Open Imagine Learning"
+        },
+        "my.imaginelearning.com/player": {
+            "matches": [
+                "*://my.imaginelearning.com/player*"
+            ],
+            "title": "Open Imagine Learning"
+        },
+        "demo.my.imaginelearning.com/player": {
+            "matches": [
+                "*://demo.my.imaginelearning.com/player*"
+            ],
+            "title": "Open Imagine Learning"
         }
     }
 }
\ No newline at end of file