Modified our Eve so it works with amd and globally

4d8dc216 · Tomas Alabes · 7fd4df74 · 4d8dc216 · 4d8dc216 · 4d8dc216
Commit 4d8dc216 authored Aug 02, 2015 by Tomas Alabes
8 changed files
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -39,7 +39,7 @@ module.exports = function(grunt) {
            dist: {
                dest: "<%= pkg.name %>.js",
                src: [
-                    "node_modules/eve/eve.js",
+                    "dev/eve.js",
                    "dev/raphael.core.js",
                    "dev/raphael.svg.js",
                    "dev/raphael.vml.js",

--- a/cortex.json
+++ b/cortex.json
 {
  "name": "raphael",
-  "version": "2.1.2",
+  "version": "2.1.4",
  "description": "JavaScript Vector Library",
-  "main": "./dev",
+  "main": "raphael",
  "repository": "git://github.com/DmitryBaranovskiy/raphael.git",
  "keywords": [
    "vector",

--- a/dev/amdDev.js
+++ b/dev/amdDev.js
@@ -2,7 +2,8 @@

 require.config({
    paths: {
-        raphael: '../raphael'
+        raphael: '../raphael'/*,
+        eve: '../bower_components/eve/eve'*/
    }
 });


--- a/dev/eve.js
+++ b/dev/eve.js
--- a/dev/raphaelTest.html
+++ b/dev/raphaelTest.html
@@ -7,7 +7,7 @@
    <!-- Global use -->

    <!-- To work with full version -->
-    <!--<script type="text/javascript" src="../raphael.js"></script>-->
+    <script type="text/javascript" src="../raphael.js"></script>

    <!-- To work with minified version -->
    <!--<script type="text/javascript" src="../raphael-min.js"></script>-->
@@ -18,21 +18,20 @@
    <!--<script type="text/javascript" src="raphael.core.js"></script>-->
    <!--<script type="text/javascript" src="raphael.svg.js"></script>-->
    <!--<script type="text/javascript" src="raphael.vml.js"></script>-->
-    <!--<script type="text/javascript" src="raphael.amd.js"></script>-->

    <!-- Comment this script tag if you are testing with AMD -->
-    <!--<script type="text/javascript">
+    <script type="text/javascript">
        // Initialize container when document is loaded
        window.onload = function () {
            paper = Raphael(0, 0, 640, 720, "container");
            paper.circle(100, 100, 100); //example
        };
        //Work here, in a separate script file or via command line
-    </script>-->
+    </script>

-    <!-- AMD use -->
-    <script data-main="amdDev" src="require.js"></script>
    <!-- Use amdDev.js to work with AMD and Raphael -->
+    <!-- You need to do a 'bower install -D' first to get requirejs -->
+    <!--<script data-main="amdDev" src="../bower_components/requirejs/require.js"></script>-->

 </head>
 <body>

--- a/dev/require.js
+++ b/dev/require.js
--- a/raphael-min.js
+++ b/raphael-min.js
--- a/raphael.js
+++ b/raphael.js
@@ -16,8 +16,17 @@
 // ├────────────────────────────────────────────────────────────┤ \\
 // │ Author Dmitry Baranovskiy (http://dmitry.baranovskiy.com/) │ \\
 // └────────────────────────────────────────────────────────────┘ \\
-
-(function (glob) {
+(function (glob, factory) {
+    if (typeof define === "function" && define.amd) {
+        define("eve", function() {
+            return factory();
+        });
+    } else if (typeof exports === "object") {
+        module.exports = factory();
+    } else {
+        glob.eve = factory();
+    }
+}(this, function(){
    var version = "0.4.2",
        has = "hasOwnProperty",
        separator = /[\.\/]/,
@@ -367,8 +376,9 @@
    eve.toString = function () {
        return "You are running Eve " + version;
    };
-    (typeof module != "undefined" && module.exports) ? (module.exports = eve) : (typeof define != "undefined" ? (define("eve", [], function() { return eve; })) : (glob.eve = eve));
-})(this);
+
+    return eve;
+}));

 // ┌────────────────────────────────────────────────────────────────────┐ \\
 // │ Raphaël 2.1.4 - JavaScript Vector Library                      │ \\