Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'master' of https://github.com/mozilla/towtruck
Conflicts: app/http/views/layout.ejs app/http/views/site/about.ejs app/http/views/towtruck/interface.html
- Loading branch information
Showing
31 changed files
with
1,292 additions
and
597 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,3 +3,4 @@ node_modules | |
.env* | ||
addon/Profile | ||
dump.rdb | ||
app/http/public/recorder.css |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
$(function () { | ||
$("#about-toggle").click(function () { | ||
if ($("#about-group").is(":visible")) { | ||
$("#about-group").hide(); | ||
$("#about-toggle").text("Essay (+)"); | ||
} else { | ||
$("#about-group").show(); | ||
$("#about-toggle").text("Essay (-)"); | ||
} | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
<!DOCTYPE html> | ||
<html> | ||
<head> | ||
<meta charset="UTF-8"> | ||
<title>TowTruck recorder</title> | ||
<script> | ||
// FIXME: need to make this dynamic: | ||
defaultHubBase = ""; | ||
baseUrl = (location.href + "").replace(/\/recorder\.html.*/, ""); | ||
// FIXME: this is copied from towtruck.js: | ||
require = { | ||
context: "towtruck", | ||
baseUrl: baseUrl + "/towtruck", | ||
urlArgs: "bust=" + Date.now(), | ||
paths: { | ||
jquery: "libs/jquery-1.8.3.min", | ||
walkabout: "libs/walkabout.js/walkabout", | ||
tinycolor: "libs/tinycolor", | ||
"alien-avatar-generator": "libs/alien-avatar-generator" | ||
}, | ||
deps: ["recorder"], | ||
callback: function () { | ||
require({context: "towtruck"})(["recorder"], function (recorder) { | ||
recorder.start({ | ||
baseUrl: baseUrl, | ||
defaultHubBase: defaultHubBase | ||
}); | ||
}); | ||
} | ||
}; | ||
console.log("require", require); | ||
</script> | ||
<script src="./towtruck/libs/require.js"></script> | ||
<link rel="stylesheet" href="recorder.css"> | ||
</head> | ||
<body> | ||
|
||
<div id="connection-status"> | ||
<span id="not-connected" data-toggles="#connection-status span">Not Connected</span> | ||
<span id="connected" data-toggles="#connection-status span" style="display: none">Connected</span> | ||
<span id="no-session-id" data-toggles="#connection-status span" style="display: none">There's no <code>#&towtruck=SESSION_ID</code> in the URL.</span> | ||
<button id="restart">Restart recording</button> | ||
<button id="select">Select record</button> | ||
</div> | ||
|
||
<div> | ||
<textarea id="record">/* TowTruck session starts */ | ||
|
||
</textarea> | ||
</div> | ||
|
||
|
||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
body { | ||
font-family: sans-serif; | ||
} | ||
|
||
#record { | ||
width: 100%; | ||
height: 80%; | ||
} | ||
|
||
#connected { | ||
font-weight: bold; | ||
color: #090; | ||
} | ||
|
||
#not-connected { | ||
color: #900; | ||
} |
Oops, something went wrong.