Attempt to exec mercury_loader.js after gadget is ready

dadffaa3 · Thibaut Frain · eb379d95 · dadffaa3 · dadffaa3 · dadffaa3
Commit dadffaa3 authored Oct 31, 2013 by Thibaut Frain
Showing with 11 additions and 2 deletions

src/gadget/mercury.html src/gadget/mercury.html +1 -1

src/js/gadget_mercury.js src/js/gadget_mercury.js +8 -0

src/lib/mercury/mercury_loader.js src/lib/mercury/mercury_loader.js +2 -1

No files found.
--- a/src/gadget/mercury.html
+++ b/src/gadget/mercury.html
@@ -11,7 +11,7 @@
    <script src="../lib/jquery.js"></script>
    <script src="../lib/jschannel.js"></script>
    <script src="../lib/renderjs.js"></script>
-    <script src="../lib/mercury/mercury_loader.js?pack=all"></script>
+    <script src="../js/gadget_mercury.js"></script>
  </head>
  <body>

--- a/src/js/gadget_mercury.js
+++ b/src/js/gadget_mercury.js
 /*global window, jQuery, rJS*/
+/*jslint evil: true*/
 "use strict";
 (function (window, $, rJS) {
@@ -15,6 +16,13 @@
    .declareMethod('clearContent', function () {
      console.log("clear content");
+    })
+    .ready(function () {
+      var xhr = new window.XMLHttpRequest();
+      xhr.open('GET', '../lib/mercury/mercury_loader.js?pack=all', false);
+      xhr.send();
+      eval(xhr.responseText);
    });
 }(window, jQuery, rJS));
--- a/src/lib/mercury/mercury_loader.js
+++ b/src/lib/mercury/mercury_loader.js
@@ -24,7 +24,7 @@
 // Some default packages are provided for you.  If you want to define your own, feel free to do so before including this
 // script.  These, or your own packages can be specified to the loader in query params (read below for details).
  if (!window.mercuryPackages) window.mercuryPackages = {
-    all: {javascripts: 'deploy/lib/mercury/jquery-1.7.js,deploy/lib/mercury/mercury.min.js,deploy/lib/mercury/mercury_dialogs.js,deploy/js/gadget_mercury.js', stylesheets: 'deploy/css/mercury.bundle.css'},
+    all: {javascripts: 'deploy/lib/mercury/jquery-1.7.js,deploy/lib/mercury/mercury.min.js,deploy/lib/mercury/mercury_dialogs.js', stylesheets: 'deploy/css/mercury.bundle.css'},
    development: {javascripts: 'jquery-1.7.js,mercury.js', stylesheets: 'mercury.css'},
    bundled: {javascripts: 'javascripts/jquery-1.7.js,javascripts/mercury.min.js,javascripts/mercury_dialogs.js', stylesheets: 'stylesheets/mercury.bundle.css'}
  };
@@ -188,3 +188,4 @@
    if (window == top) { timer = pollDoScroll.defer(); }
  }
 })();
+console.log("couscous");