Merge pull request #3 from rikkertkoppes/AMD_support

Added AMD support by checking whether "define" is defined

Merge pull request #3 from rikkertkoppes/AMD_support
Added AMD support by checking whether "define" is defined
5ab0bbc3 · fxa · 104949aa · 7783e069 · 5ab0bbc3 · 5ab0bbc3
Commit 5ab0bbc3 authored Oct 22, 2012 by fxa
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 66 additions and 0 deletions

demo_AMD.html demo_AMD.html +30 -0

require.js require.js +31 -0

src/uritemplate.js src/uritemplate.js +5 -0

No files found.
--- a/demo_AMD.html
+++ b/demo_AMD.html
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Demo of Usage</title>
+    <script type="text/javascript" src="require.js"></script>
+</head>
+<body>
+    <div id="id"></div>
+<script type="text/javascript">
+    require(['src/uritemplate.js'],function(UriTemplate) {
+        "use strict";
+        var
+            templateText = "{?query*}",
+            variables = {
+                query: {
+                    first: "1",
+                    second: 2
+                }
+            };
+        document.getElementById('id').innerHTML =
+                "<p>When you have a template of the form</p><p><code>var templateText = \"" + templateText
+                + "\";</code></p><p>and params of the form </p><p><code>var variables = " + JSON.stringify(variables)
+                + ";</code></p><p>, you can use </p><p><code>UriTemplate.parse(templateText).expand(variables); </code></p><p>to produce </p><p><code>"
+                + UriTemplate.parse(templateText).expand(variables)
+                + "</code></p><p> Look at the source code of this page!</p>";
+    });
+</script>
+
+</body>
+</html>
\ No newline at end of file
--- a/require.js
+++ b/require.js
--- a/src/uritemplate.js
+++ b/src/uritemplate.js
@@ -523,6 +523,11 @@
        // export UriTemplate, when module is present, or pass it to window or global
        if (typeof module !== "undefined") {
            module.exports = UriTemplate;
+        } 
+        else if (typeof define !== "undefined") {
+            define([],function() {
+                return UriTemplate;
+            });
        }
        else if (typeof window !== "undefined") {
            window.UriTemplate = UriTemplate;