Merge branch 'history' into historyOO

www/common/inner/snapshots.js

@@ -46,6 +46,13 @@ define([
             sframeChan.query("Q_GET_SNAPSHOT", {hash: config.hash}, function (err, obj) {
                 if (err || (obj && obj.error)) { return void console.error(err || obj.error); }
                 if (!Array.isArray(obj)) { return void console.error("invalid type"); }
+                if (!obj.length) { return void console.error("Empty channel"); }
+                var checkLast = obj[obj.length - 1].serverHash === config.hash;
+                if (!checkLast) {
+                    $snap.find('.cp-toolbar-snapshots-close').click();
+                    return void UI.alert(Messages.snapshots_notFound);
+                }
+
                 var messages = obj;
                 var chainpad = createChainPad();
                 messages.forEach(function (m) {
@@ -57,6 +64,7 @@ define([
             });
         };
 
+Messages.snapshots_notFound = "This snapshot no longer exists. It has been deleted with the history of the pad.";
 Messages.snapshots_restore = "Restore"; // XXX
 Messages.snapshots_close = "Close";
 Messages.snapshots_cantRestore = "Can't restore now. Disconnected...";

www/common/sframe-common-history.js

@@ -214,6 +214,16 @@ define([
                 var messages = (data.messages || []).map(function (obj) {
                     return obj;
                 });
+
+                // We're supposed to receive 2 checkpoints. If the result is only ONE message
+                // and this message is a checkpoint, it means it's the last message of the history
+                // (and this is a trimmed history)
+                if (messages.length === 1) {
+                    var parsed = JSON.parse(messages[0].msg);
+                    if (parsed[0] === 4) {
+                        isComplete = true;
+                    }
+                }
                 if (config.debug) { console.log(data.messages); }
                 Array.prototype.unshift.apply(allMessages, messages); // Destructive concat
                 fillChainPad(realtime, allMessages);