changeset 3093:2861ad69b77d

Merge branch 'master' into vnext

--- a/interfaces/ape.js	Fri Jan 12 15:45:59 2018 +0000
+++ b/interfaces/ape.js	Fri Jan 12 15:50:08 2018 +0000
@@ -587,7 +587,7 @@
         }
         var imgurl = node.specification.image || interfaceObject.image || "";
         this.imageHolder.setImage(imgurl);
-    }
+    };
 }
 
 function sliderObject(audioObject, interfaceObjects, index) {

--- a/interfaces/blank.js	Fri Jan 12 15:45:59 2018 +0000
+++ b/interfaces/blank.js	Fri Jan 12 15:50:08 2018 +0000
@@ -9,7 +9,7 @@
 function loadInterface() {
     // Use this to do any one-time page / element construction. For instance, placing any stationary text objects,
     // holding div's, or setting up any nodes which are present for the entire test sequence
-};
+}
 
 function loadTest(page) {
     // Called each time a new test page is to be build. The page specification node is the only item passed in
@@ -50,8 +50,8 @@
     };
     this.error = function () {
         // If there is an error with the audioObject, this will be called to indicate a failure
-    }
-};
+    };
+}
 
 function resizeWindow(event) {
     // Called on every window resize event, use this to scale your page properly

--- a/interfaces/ordinal.js	Fri Jan 12 15:45:59 2018 +0000
+++ b/interfaces/ordinal.js	Fri Jan 12 15:50:08 2018 +0000
@@ -2,7 +2,7 @@
  * WAET Blank Template
  * Use this to start building your custom interface
  */
-/*globals interfaceContext, window, document, specification, audioEngineContext, console, testState, $, storage */
+/*globals interfaceContext, window, document, specification, audioEngineContext, console, testState, $, storage, sessionStorage */
 // Once this is loaded and parsed, begin execution
 loadInterface();
 
@@ -271,11 +271,11 @@
 
         e.dataTransfer.dropEffect = 'move'; // See the section on the DataTransfer object.
         var srcid = e.dataTransfer.getData('text/plain');
-        if (srcid == "") {
+        if (srcid === "") {
             srcid = sessionStorage.getItem("drag-object");
         }
         console.log(srcid);
-        var srcid = Number(srcid);
+        srcid = Number(srcid);
         var elements = container.childNodes;
         var srcObject = audioEngineContext.audioObjects.find(function (ao) {
             return ao.id === srcid;