Desactivate non renderJS compatible code.

Gadget should not access to global and should not share common properties.

Desactivate non renderJS compatible code.
Gadget should not access to global and should not share common properties.
c69b64e0 · Romain Courteaud · Jérome Perrin · 1b11f525 · c69b64e0 · c69b64e0
Commit c69b64e0 authored Jun 11, 2014 by Romain Courteaud Committed by Jérome Perrin Aug 11, 2014
4 changed files
--- a/dream/platform/src2/dream/production_line.html
+++ b/dream/platform/src2/dream/production_line.html
@@ -4,8 +4,8 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <title>Edit table</title>
-    <script src="<%= copy.rsvp.relative_dest %>" type="text/javascript"></script>
+    <script src="../<%= copy.rsvp.relative_dest %>" type="text/javascript"></script>
-    <script src="<%= copy.renderjs.relative_dest %>" type="text/javascript"></script>
+    <script src="../<%= copy.renderjs.relative_dest %>" type="text/javascript"></script>
    <script src="document_page_mixin.js" type="text/javascript"></script>
    <script src="production_line.js" type="text/javascript"></script>

--- a/dream/platform/src2/dream/production_line.js
+++ b/dream/platform/src2/dream/production_line.js
-/*global console, rJS, RSVP, initDocumentPageMixin */
+/*global window, rJS, RSVP, initDocumentPageMixin */
-(function(window, rJS, RSVP, initDocumentPageMixin) {
+/*jslint nomen: true */
-    "use strict";
+(function (window, rJS, RSVP, initDocumentPageMixin) {
-    var gadget_klass = rJS(window);
+  "use strict";
-    initDocumentPageMixin(gadget_klass);
+  var gadget_klass = rJS(window);
-    gadget_klass.ready(function(g) {
+  initDocumentPageMixin(gadget_klass);
-        g.props = {};
+  gadget_klass
-    }).ready(function(g) {
+    .ready(function (g) {
-        return g.getElement().push(function(element) {
+      g.props = {};
-            g.props.element = element;
+    })
+    .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;
+    .declareAcquiredMethod("aq_getAttachment", "jio_getAttachment")
-        gadget.props.jio_key = jio_key;
+    .declareMethod("render", function (options) {
-      return new RSVP.Queue().push(function() {
+      var jio_key = options.id, gadget = this;
-            return RSVP.all([ gadget.aq_getAttachment({
+      gadget.props.jio_key = jio_key;
-                _id: jio_key,
+      return new RSVP.Queue()
-                _attachment: "body.json"
+        .push(function () {
-            }), gadget.getDeclaredGadget("productionline") ]);
+          return RSVP.all([
-        }).push(function(result_list) {
+            gadget.aq_getAttachment({
-            return result_list[1].render(result_list[0]);
+              _id: jio_key,
+              _attachment: "body.json"
+            }),
+            gadget.getDeclaredGadget("productionline")
+          ]);
+        }).push(function (result_list) {
+          return result_list[1].render(result_list[0]);
        });
-    }).declareMethod("startService", function() {
+    })
-        return this.getDeclaredGadget("productionline").push(function(productionline) {
+    .declareMethod("startService", function () {
-            return productionline.startService();
+      return this.getDeclaredGadget("productionline")
+        .push(function (productionline) {
+          return productionline.startService();
        });
    });
-})(window, rJS, RSVP, initDocumentPageMixin);
+}(window, rJS, RSVP, initDocumentPageMixin));
\ No newline at end of file
--- a/dream/platform/src2/jsplumb/index.html
+++ b/dream/platform/src2/jsplumb/index.html
@@ -2,14 +2,13 @@
 <html>
  <head>
    <meta charset="utf-8">
-    <link rel="stylesheet" href="<%= curl.jqueryuicss.relative_dest %>">
+    <!--link rel="stylesheet" href="<%= curl.jqueryuicss.relative_dest %>"-->
-    <script src="curl.jquery.relative_dest %>"></script>
+    <!--script src="curl.jquery.relative_dest %>"></script-->
-    <script src="curl.jqueryuijs.relative_dest %>"></script>
+    <!--script src="curl.jqueryuijs.relative_dest %>"></script-->
-    <script src="copy.rsvp.relative_dest %>"></script>
+    <script src="../<%= copy.rsvp.relative_dest %>" type="text/javascript"></script>
-    <script src="copy.renderjs.relative_dest %>"></script>
+    <script src="../<%= copy.renderjs.relative_dest %>" type="text/javascript"></script>
-    <script src="copy.handlebars.relative_dest %>"></script>
+    <script src="../<%= curl.jsplumbjs.relative_dest %>" type="text/javascript"></script>
-    <script src="curl.jsplumbjs.relative_dest %>"></script>
    <script src="jsplumb.js"></script>
  </head>

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