Refactored jsPlumb gadget (works with one instance of jsPlumb per gadget)

614256b8 · Thibaut Frain · Jérome Perrin · c7ccdf82 · 614256b8 · 614256b8
Commit 614256b8 authored Jun 13, 2014 by Thibaut Frain Committed by Jérome Perrin Aug 11, 2014
5 changed files
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -66,7 +66,9 @@ module.exports = function (grunt) {
        },
        files: {
          "<%= global_config.dest %>/dream/index.css":
-            "<%= global_config.src %>/dream/index.less"
+            "<%= global_config.src %>/dream/index.less",
+          "<%= global_config.dest %>/jsplumb/jsplumb.css":
+            "<%= global_config.src %>/jsplumb/jsplumb.css"
        }
      }
    },

--- a/dream/platform/src2/dream/Input_viewProductionLine.js
+++ b/dream/platform/src2/dream/Input_viewProductionLine.js
-/*global window, rJS, RSVP, initDocumentPageMixin */
-/*jslint nomen: true */
+/*global console, rJS, RSVP, initDocumentPageMixin */
 (function (window, rJS, RSVP, initDocumentPageMixin) {
  "use strict";
  var gadget_klass = rJS(window);
  initDocumentPageMixin(gadget_klass);
  gadget_klass
+
    .ready(function (g) {
      g.props = {};
    })
+
    .ready(function (g) {
      return g.getElement()
        .push(function (element) {
          g.props.element = element;
        });
    })
+
    .declareAcquiredMethod("aq_getAttachment", "jio_getAttachment")
+
    .declareMethod("render", function (options) {
      var jio_key = options.id, gadget = this;
      gadget.props.jio_key = jio_key;
      return new RSVP.Queue()
        .push(function () {
+          /*jslint nomen: true*/
          return RSVP.all([
            gadget.aq_getAttachment({
              _id: jio_key,
              _attachment: "body.json"
-            }),
-            gadget.getDeclaredGadget("productionline")
-          ]);
-        }).push(function (result_list) {
+            }), gadget.getDeclaredGadget("productionline") ]);
+        })
+        .push(function (result_list) {
+          console.log(result_list);
+          console.log(result_list[0]);
+          console.log(result_list[1]);
+          console.log(result_list.length);
+          window.r = result_list[1];
          return result_list[1].render(result_list[0]);
        });
    })
+
    .declareMethod("startService", function () {
      return this.getDeclaredGadget("productionline")
        .push(function (productionline) {

--- a/dream/platform/src2/jsplumb/index.html
+++ b/dream/platform/src2/jsplumb/index.html
@@ -2,13 +2,14 @@
 <html>
  <head>
    <meta charset="utf-8">
-    <!--link rel="stylesheet" href="<%= curl.jqueryuicss.relative_dest %>"-->
-    
-    <!--script src="curl.jquery.relative_dest %>"></script-->
-    <!--script src="curl.jqueryuijs.relative_dest %>"></script-->
-    <script src="../<%= copy.rsvp.relative_dest %>" type="text/javascript"></script>
-    <script src="../<%= copy.renderjs.relative_dest %>" type="text/javascript"></script>
-    <script src="../<%= curl.jsplumbjs.relative_dest %>" type="text/javascript"></script>
+    <link rel="stylesheet" href="../<%= curl.jqueryuicss.relative_dest %>">
+    <link rel="stylesheet" href="jsplumb.css">
+
+    <script src="../<%= curl.jquery.relative_dest %>"></script>
+    <script src="../<%= curl.jqueryuijs.relative_dest %>"></script>
+    <script src="../<%= copy.rsvp.relative_dest %>"></script>
+    <script src="../<%= copy.renderjs.relative_dest %>"></script>
+    <script src="../<%= curl.jsplumbjs.relative_dest %>"></script>

    <script src="jsplumb.js"></script>
  </head>

--- a/dream/platform/src2/jsplumb/jsplumb.css
+++ b/dream/platform/src2/jsplumb/jsplumb.css
--- a/dream/platform/src2/jsplumb/jsplumb.js
+++ b/dream/platform/src2/jsplumb/jsplumb.js