# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1484822862 0
# Node ID e3cf3c24149eee8ef37ff121002239489c81ae70
# Parent  a33b66ca3baa30af09e6b1a65b5a0e27684c1b07# Parent  03a9a90717ed7b9906236e258f83770b8de5b3fb
Including samediff into global label-maker (34b20b6)

Merge branch 'master' into vnext

# Conflicts:
#	interfaces/AB.js

diff -r a33b66ca3baa -r e3cf3c24149e interfaces/timeline.js
--- a/interfaces/timeline.js	Wed Jan 18 14:54:12 2017 +0000
+++ b/interfaces/timeline.js	Thu Jan 19 10:47:42 2017 +0000
@@ -55,8 +55,8 @@
     submit.id = 'submit-button';
     submit.style.float = 'left';
     // Append the interface buttons into the interfaceButtons object.
+    interfaceButtons.appendChild(submit);
     interfaceButtons.appendChild(playback);
-    interfaceButtons.appendChild(submit);
 
     // Create outside reference holder
     var outsideRef = document.createElement("div");
diff -r a33b66ca3baa -r e3cf3c24149e js/core.js
--- a/js/core.js	Wed Jan 18 14:54:12 2017 +0000
+++ b/js/core.js	Thu Jan 19 10:47:42 2017 +0000
@@ -3270,6 +3270,14 @@
                     return String.fromCharCode((index + offset) % 26 + 97);
                 case "capital":
                     return String.fromCharCode((index + offset) % 26 + 65);
+                case "samediff":
+                    if (index == 0) {
+                        return "Same";
+                    } else if (index == 1) {
+                        return "Difference";
+                    } else {
+                        return "";
+                    }
                 case "number":
                     return String(index + offset);
                 default:
diff -r a33b66ca3baa -r e3cf3c24149e xml/test-schema.xsd
--- a/xml/test-schema.xsd	Wed Jan 18 14:54:12 2017 +0000
+++ b/xml/test-schema.xsd	Thu Jan 19 10:47:42 2017 +0000
@@ -93,6 +93,7 @@
                             <xs:enumeration value="number" />
                             <xs:enumeration value="letter" />
                             <xs:enumeration value="capital" />
+                            <xs:enumeration value="samediff" />
                         </xs:restriction>
                     </xs:simpleType>
                 </xs:attribute>