Merge branch 'master' of https://github.com/publiclab/image-sequencer

Pull necessary changes

dist/image-sequencer.js

@@ -184406,7 +184406,7 @@ module.exports = function ImageSelect(options) {
 
   // this module is unique because it creates the image
   function draw(image) {
-    options.el.html(image);
+    el.html(image);
     if (options.output) options.output(image);
   }
 
@@ -184431,25 +184431,28 @@ module.exports = function ImageThreshold(options) {
   var image;
 
   function draw(inputImage) {
-    var canvas = document.createElement('canvas');
-    canvas.width = inputImage.naturalWidth;
-    canvas.height = inputImage.naturalHeight;
-    var context = canvas.getContext('2d');
-    context.drawImage(inputImage, 0, 0 );
-    var imageData = context.getImageData(0, 0, inputImage.naturalWidth, inputImage.naturalHeight);
+    $(inputImage).load(function(){
+      var canvas = document.createElement('canvas');
+      canvas.width = inputImage.naturalWidth;
+      canvas.height = inputImage.naturalHeight;
+      var context = canvas.getContext('2d');
+      context.drawImage(inputImage, 0, 0);
 
-    var imageThreshold = require('image-filter-threshold');
-    var imageFilterCore = require('image-filter-core');
+      var imageData = context.getImageData(0, 0, canvas.width, canvas.height);
 
-    var result = imageThreshold({
-      data: imageData,
-      threshold: options.threshold
-    }).then(function (imageData) {
-      image = new Image();
-      image.onload = function onLoad() {
-        if (options.output) options.output(image);
-      }
-     image.src = imageFilterCore.convertImageDataToCanvasURL(imageData);
+      var imageThreshold = require('image-filter-threshold');
+      var imageFilterCore = require('image-filter-core');
+
+      var result = imageThreshold({
+        data: imageData,
+        threshold: options.threshold
+      }).then(function (imageData) {
+        image = new Image();
+        image.onload = function onLoad() {
+          if (options.output) options.output(image);
+        }
+       image.src = imageFilterCore.convertImageDataToCanvasURL(imageData);
+      });
     });
   }
 

index.html

@@ -75,7 +75,7 @@
 
           e.preventDefault();
           sequencer.addStep($('.select-module').val());
-          sequencer.run();
+          sequencer.run(); // later we might only run this step, if we can fetch the image output from the previous
 
         });