ensure polyfills are loaded first

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>
zvelo · Jun 17, 2013 · beb58c4 · beb58c4
1 parent 0184561
commit beb58c4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
@@ -185,16 +185,10 @@ module.exports = (grunt) ->
     "karma:amd:run"
   ]
 
-  grunt.registerTask "runExample", "Start the example web server", ->
+  grunt.registerTask "example", "Start the example web server", ->
     done = @async() ## by never calling done, the server is kept alive
     require("./example/server").listen()
 
-  grunt.registerTask "example", [
-    "build:main"
-    "build:example"
-    "runExample"
-  ]
-
   grunt.registerMultiTask "testFiles", "Concat and build all test files", ->
     baseDir = "test/src/base"
     config = grunt.config "coffee"

diff --git a/example/public/js/main.js b/example/public/js/main.js
diff --git a/example/src/main.coffee b/example/src/main.coffee
@@ -1,6 +1,11 @@
-requirejs.config
+require.config
   baseUrl: "js"
   paths:
     jquery: "//ajax.googleapis.com/ajax/libs/jquery/2.0.1/jquery.min"
-
-require [ "poly/function", "jquery", "example" ]
+  packages: [
+    name:     "poly"
+    location: "poly"
+    main:     "poly"
+  ]
+  deps: [ "poly/function", "jquery" ]
+  callback: -> require [ "example" ]