#458 demo now works fine on iPhone.

joola · May 29, 2014 · 7040efa · 7040efa
1 parent f4949b3
commit 7040efa
Showing 1 changed file with 53 additions and 34 deletions.
diff --git a/lib/webserver/public/js/site.js b/lib/webserver/public/js/site.js
@@ -4,22 +4,10 @@ var realtime = true;
 var filter = [];
 var userid = joolaio.common.uuid();
 
+
 joolaio.events.on('ready', function () {
-  joolaio.beacon.insert('demo-visits', {
-    timestamp: null,
-    browser: $.ua.browser.name,
-    device: $.ua.device.name,
-    engine: $.ua.engine.name,
-    os: $.ua.os.name,
-    userid: userid,
-    ip: codehelper_ip.IP,
-    referrer: document.referrer,
-    visits: 1,
-    loadtime: window.performance.timing.loadEventEnd - window.performance.timing.navigationStart
-  }, {});
-
-  $(document).click(function (event) {
-    joolaio.beacon.insert('demo-clicks', {
+  try {
+    joolaio.beacon.insert('demo-visits', {
       timestamp: null,
       browser: $.ua.browser.name,
       device: $.ua.device.name,
@@ -28,16 +16,13 @@ joolaio.events.on('ready', function () {
       userid: userid,
       ip: codehelper_ip.IP,
       referrer: document.referrer,
-      clicks: 1
+      visits: 1,
+      loadtime: (window.performance && window.performance.timing ? window.performance.timing.loadEventEnd - window.performance.timing.navigationStart : null)
     }, {});
-  });
 
-  var iTimeoutMoves = 0;
-  var moves = 0;
-  $(document).mousemove(function (event) {
-    function pushMoves() {
-      if (moves > 0) {
-        var doc = {
+    $(document).click(function (event) {
+      try {
+        joolaio.beacon.insert('demo-clicks', {
           timestamp: null,
           browser: $.ua.browser.name,
           device: $.ua.device.name,
@@ -46,20 +31,54 @@ joolaio.events.on('ready', function () {
           userid: userid,
           ip: codehelper_ip.IP,
           referrer: document.referrer,
-          mousemoves: moves
-        };
-        joolaio.beacon.insert('demo-mousemoves', doc, {});
-        moves = 0;
+          clicks: 1
+        }, {});
       }
-    }
+      catch (ex) {
+        $('#log').append('<div>' + ex + '</div>');
+        console.log(ex);
+      }
+    });
+
+    var iTimeoutMoves = 0;
+    var moves = 0;
+    $(document).mousemove(function (event) {
+      try {
+        function pushMoves() {
+          if (moves > 0) {
+            var doc = {
+              timestamp: null,
+              browser: $.ua.browser.name,
+              device: $.ua.device.name,
+              engine: $.ua.engine.name,
+              os: $.ua.os.name,
+              userid: userid,
+              ip: codehelper_ip.IP,
+              referrer: document.referrer,
+              mousemoves: moves
+            };
+            joolaio.beacon.insert('demo-mousemoves', doc, {});
+            moves = 0;
+          }
+        }
 
-    clearTimeout(iTimeoutMoves);
+        clearTimeout(iTimeoutMoves);
 
-    moves++;
-    if (moves > 100)
-      pushMoves();
-    iTimeoutMoves = setTimeout(pushMoves, 100);
-  });
+        moves++;
+        if (moves > 100)
+          pushMoves();
+        iTimeoutMoves = setTimeout(pushMoves, 100);
+      }
+      catch (ex) {
+        $('#log').append('<div>' + ex + '</div>');
+        console.log(ex);
+      }
+    });
+  }
+  catch (ex) {
+    $('#log').append('<div>' + ex + '</div>');
+    console.log(ex);
+  }
 });
 
 joolaio.events.on('ready', function () {