Use RequireJs in examples.

Add new version of RequireJs. Refactor RenderJs init part.

Use RequireJs in examples.
Add new version of RequireJs. Refactor RenderJs init part.
9bcdd5fc · Ivan Tyagov · 4d5ebb91 · 9bcdd5fc · 9bcdd5fc · 9bcdd5fc
Commit 9bcdd5fc authored Nov 02, 2012 by Ivan Tyagov
7 changed files
--- a/examples/hello_world/index.html
+++ b/examples/hello_world/index.html
 <html>
  <head>
-    <!-- Use proper path -->
-    <script type="text/javascript" src="../../lib/require/require.js"> </script>
-    <script type="text/javascript"  src="../../lib/jquery/jquery.js"> </script>
-    <script type="text/javascript" src="../../renderjs.js"></script>
+    <script data-main="../../require-renderjs.js"
+            type="text/javascript"
+            src="../../lib/require/require.js"></script>
  <head>
  <body>
    <div id="say-hello"

--- a/examples/initialize_gadget/index.html
+++ b/examples/initialize_gadget/index.html
 <html>
  <head>
-    <script type="text/javascript" src="../../lib/require/require.js"> </script>
-    <script type="text/javascript"  src="../../lib/jquery/jquery.js"> </script>
-    <script type="text/javascript" src="../../renderjs.js"></script>
+    <script data-main="../../require-renderjs.js"
+            type="text/javascript"
+            src="../../lib/require/require.js"></script>
  <head>
  <body>
    <div id="init-gadget"

--- a/examples/interactions/index.html
+++ b/examples/interactions/index.html
 <html>
  <head>
-    <script type="text/javascript" src="../../lib/require/require.js"> </script>
-    <script type="text/javascript" src="../../lib/jquery/jquery.js"> </script>
-    <script type="text/javascript" src="../../renderjs.js"></script>
+    <script data-main="../../require-renderjs.js"
+            type="text/javascript"
+            src="../../lib/require/require.js"></script>
  <head>
  <body>


--- a/examples/recursive/index.html
+++ b/examples/recursive/index.html
 <html>
  <head>
-    <script type="text/javascript" src="../../lib/require/require.js"> </script>
-    <script type="text/javascript"  src="../../lib/jquery/jquery.js"> </script>
-    <script type="text/javascript" src="../../renderjs.js"></script>
+    <script data-main="../../require-renderjs.js"
+            type="text/javascript"
+            src="../../lib/require/require.js"></script>
  <head>
  <body>
    <div id="recursive"

--- a/lib/require/require.js
+++ b/lib/require/require.js
--- a/renderjs.js
+++ b/renderjs.js
@@ -32,6 +32,30 @@ var RenderJs = (function () {
    var is_ready = false;

    return {
+        init: function () {
+          /*
+           * Do all initialization
+           */
+          if (RENDERJS_ENABLE_IMPLICIT_GADGET_RENDERING) {
+              RenderJs.bootstrap($('body'));
+          }
+          if (RENDERJS_ENABLE_IMPLICIT_INTERACTION_BIND) {
+            var root_gadget = RenderJs.GadgetIndex.getRootGadget();
+            // We might have a page without gadgets.
+            // Be careful, right now we can be in this case because
+            // asynchronous gadget loading is not finished
+            if (root_gadget !== undefined) {
+              RenderJs.bindReady(
+                function () {
+                  // examine all Intaction Gadgets and bind accordingly
+                  $("div[data-gadget-connection]").each( function(index, element) {
+                    RenderJs.InteractionGadget.bind($(element));
+                  })
+                });
+            }
+          };
+        },
+
        bootstrap: function (root) {
            /* initial load application gadget */
            var gadget_id;
@@ -570,22 +594,5 @@ var RenderJs = (function () {

 // impliticly call RenderJs bootstrap
 $(document).ready(function () {
-    if (RENDERJS_ENABLE_IMPLICIT_GADGET_RENDERING) {
-        RenderJs.bootstrap($('body'));
-    }
-    if (RENDERJS_ENABLE_IMPLICIT_INTERACTION_BIND) {
-      var root_gadget = RenderJs.GadgetIndex.getRootGadget();
-      // We might have a page without gadgets.
-      // Be careful, right now we can be in this case because
-      // asynchronous gadget loading is not finished
-      if (root_gadget !== undefined) {
-        RenderJs.bindReady(
-           function () {
-             // examine all Intaction Gadgets and bind accordingly
-             $("div[data-gadget-connection]").each( function(index, element) {
-               RenderJs.InteractionGadget.bind($(element));
-             })
-           });
-      }
-    }
+    RenderJs.init();
 });
--- a/require-renderjs.js
+++ b/require-renderjs.js
+// JavaScript file that is used to load RenderJs depenencies
+
+require(["../../lib/jquery/jquery.js",
+         "../../renderjs.js"],
+        function (domReady) {
+          // Place code to be executed when libraries are loaded
+        });
+
+