You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@senssoft.apache.org by rf...@apache.org on 2016/12/12 17:01:37 UTC
[1/2] incubator-senssoft-useralejs git commit: Added barebones HTML
page for quick log testing. Added view engine and static resources to server
Repository: incubator-senssoft-useralejs
Updated Branches:
refs/heads/master 2faab6e52 -> 0ab4c866e
Added barebones HTML page for quick log testing. Added view engine and static resources to server
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/commit/31386dcb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/tree/31386dcb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/diff/31386dcb
Branch: refs/heads/master
Commit: 31386dcbefc9ce621a599f9b3917546401f064a9
Parents: 2faab6e
Author: Rob Foley <rg...@users.noreply.github.com>
Authored: Mon Dec 12 11:59:06 2016 -0500
Committer: Rob Foley <rg...@users.noreply.github.com>
Committed: Mon Dec 12 11:59:06 2016 -0500
----------------------------------------------------------------------
example/index.html | 16 ++++++++++++++++
example/server.js | 4 +++-
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/blob/31386dcb/example/index.html
----------------------------------------------------------------------
diff --git a/example/index.html b/example/index.html
new file mode 100644
index 0000000..ae18a4a
--- /dev/null
+++ b/example/index.html
@@ -0,0 +1,16 @@
+<html>
+<head>
+ <title>UserAleJS - Example Page</title>
+ <script
+ src="build/userale-0.2.1.min.js"
+ data-url="http://localhost:8000/"
+ data-user="example-user"
+ data-version="1.0.0"
+ ></script>
+</head>
+<body>
+ <div class="container">
+ <button id="test_button">Click me!</button>
+ </div>
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/blob/31386dcb/example/server.js
----------------------------------------------------------------------
diff --git a/example/server.js b/example/server.js
index f0826f0..354219e 100644
--- a/example/server.js
+++ b/example/server.js
@@ -53,10 +53,12 @@ app.use(function (req, res, next) {
});
app.use(bodyParser.urlencoded({extended: true, limit: '100mb'}));
app.use(bodyParser.json({limit: '100mb'}));
+app.use('/build', express.static(path.join(__dirname, '/../build')));
+app.set('view engine', 'jade');
app.get('/', function (req, res) {
- res.send('UserAle Local');
+ res.sendfile('index.html', { root: __dirname });
});
app.post('/', function (req, res) {
[2/2] incubator-senssoft-useralejs git commit: Fixed log clientTime
being negative for some reason
Posted by rf...@apache.org.
Fixed log clientTime being negative for some reason
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/commit/0ab4c866
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/tree/0ab4c866
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/diff/0ab4c866
Branch: refs/heads/master
Commit: 0ab4c866e5e27f11d579202651ab1660da1089e5
Parents: 31386dc
Author: Rob Foley <rg...@users.noreply.github.com>
Authored: Mon Dec 12 11:59:28 2016 -0500
Committer: Rob Foley <rg...@users.noreply.github.com>
Committed: Mon Dec 12 11:59:28 2016 -0500
----------------------------------------------------------------------
src/packageLogs.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/blob/0ab4c866/src/packageLogs.js
----------------------------------------------------------------------
diff --git a/src/packageLogs.js b/src/packageLogs.js
index 4924279..9e9b85a 100644
--- a/src/packageLogs.js
+++ b/src/packageLogs.js
@@ -36,7 +36,7 @@ export function packageLog(e, detailFcn) {
var log = {
'target' : getSelector(e.target),
'path' : buildPath(e),
- 'clientTime' : ~~((e.timeStamp && e.timeStamp > 0) ? config.time(e.timeStamp) : Date.now()),
+ 'clientTime' : Math.floor((e.timeStamp && e.timeStamp > 0) ? config.time(e.timeStamp) : Date.now()),
'location' : getLocation(e),
'type' : e.type,
'userAction' : true,