wip : replace Job by promises

src/js/model/frame/AsyncCachedFrameProcessor.js

@@ -15,7 +15,7 @@
    * @param  {String} namespace
    * @return {Object} the processed frame
    */
-  ns.AsyncCachedFrameProcessor.prototype.get = function (frame, callback, namespace) {
+  ns.AsyncCachedFrameProcessor.prototype.get = function (frame, namespace) {
     var processedFrame = null;
     namespace = namespace || this.defaultNamespace;
 
@@ -35,18 +35,21 @@
         processedFrame = this.outputCloner(cache[secondCacheKey], frame);
         cache[firstCacheKey] = processedFrame;
       } else {
-        this.frameProcessor(frame, this.onFrameProcessorComplete.bind(this, callback, cache, firstCacheKey, secondCacheKey));
+        var deferred = Q.defer();
+        this.frameProcessor(frame, this.onFrameProcessorComplete.bind(this, deferred, cache, firstCacheKey, secondCacheKey));
+        return deferred.promise;
       }
     }
 
     if (processedFrame) {
-      callback(processedFrame);
+      return Q.fcall(processedFrame);
     }
   };
 
-  ns.AsyncCachedFrameProcessor.prototype.onFrameProcessorComplete = function (callback, cache, firstCacheKey, secondCacheKey, processedFrame) {
+  ns.AsyncCachedFrameProcessor.prototype.onFrameProcessorComplete = function (deferred, cache, firstCacheKey, secondCacheKey, processedFrame) {
     cache[secondCacheKey] = processedFrame;
     cache[firstCacheKey] = processedFrame;
-    callback(processedFrame);
+    console.log('RESOLVING');
+    deferred.resolve(processedFrame);
   }
 })();

src/js/service/CurrentColorsService.js

@@ -53,29 +53,24 @@
     var layers = this.piskelController.getLayers();
     var frames = layers.map(function (l) {return l.getFrames();}).reduce(function (p, n) {return p.concat(n);});
 
-    this.currentJob = new pskl.utils.Job({
+    Q.all(
-      items : frames,
+      frames.map(function (frame) {
-      args : {
+        return this.cachedFrameProcessor.get(frame);
-        colors : {}
+      }.bind(this))
-      },
+    ).done(function (results) {
-      process : function (frame, callback) {
+      console.log('ALL DONE');
-        return this.cachedFrameProcessor.get(frame, callback);
+
-      }.bind(this),
+      var colors = {};
-      onProcessEnd : function (frameColors) {
+      results.forEach(function (result) {
-        var colors = this.args.colors;
+        Object.keys(result).forEach(function (color) {
-        Object.keys(frameColors).slice(0, Constants.MAX_CURRENT_COLORS_DISPLAYED).forEach(function (color) {
           colors[color] = true;
         });
-      },
+      })
-      onComplete : this.updateCurrentColorsReady_.bind(this)
+      this.updateCurrentColorsReady_(colors);
-    });
+    }.bind(this))
-
-    this.currentJob.start();
   };
 
-  ns.CurrentColorsService.prototype.updateCurrentColorsReady_ = function (args) {
+  ns.CurrentColorsService.prototype.updateCurrentColorsReady_ = function (colors) {
-    var colors = args.colors;
-
     // Remove transparent color from used colors
     delete colors[Constants.TRANSPARENT_COLOR];
 

src/piskel-script-list.js

@@ -51,6 +51,9 @@
   // Spectrum color-picker library
   "js/lib/spectrum/spectrum.js",
 
+  // Promises
+  "js/lib/q.js",
+
   // Application libraries-->
   "js/rendering/DrawingLoop.js",