Permalink
Browse files

REMOVED - Modernizr + bumped version

  • Loading branch information...
1 parent 3fd7fe2 commit 07f5b08d15d6c852e9b53a5982d2cf2bf66bbdb5 @glesperance committed Apr 19, 2012
Showing with 7 additions and 24 deletions.
  1. +6 −23 lib/controller.js
  2. +1 −1 package.json
View
@@ -32,9 +32,13 @@ var rocket_tmpl = {};
, require_configuration = global.require_configuration || {}
;
- header.push("<script>")
- header.push("window.Modernizr || document.write('<script src=\"/js/rocket/vendors/modernizr-2.0.6.custom.min.js\"><\\/script>')");
+ header.push("<script>");
+ header.push("var _b = " + JSON.stringify(args) + "; ");
+ header.push("document.write('<script src=\"/js/rocket/vendors/require-1.0.6.min.js\"><\\/script>')");
header.push("var require = " + JSON.stringify(require_configuration) + ";");
+ header.push("require.deps || (require.deps = []);");
+ header.push("require.deps.push('" + controller_name + "_client" + "')");
+ header.push("require.callback = " + "function() { require(['" + controller_name + "_client" + "'], function(m) { m && m.init && m.init.apply(m, _b); })}");
header.push("</script>")
return header.join('\n');
@@ -49,27 +53,6 @@ var rocket_tmpl = {};
, footer = []
;
- footer.push("<script>");
-
- footer.push("var _b = " + JSON.stringify(args) + "; ");
-
- footer.push(" yepnope.addPrefix('preload', function(resource) {");
- footer.push(" resource.noexec = true;");
- footer.push(" return resource;");
- footer.push(" });");
-
- footer.push(" Modernizr.load([");
-
- if (typeof controller_name) {
- footer.push(" { load : '/js/rocket/vendors/require-1.0.6.min.js' }");
- footer.push(" , { load : '" + (process.env['NODE_ENV'] === 'production' ? '' : 'preload!') + "/js/" + controller_name + "_client.js" + ('?' + require_configuration.urlArgs || '') + "'");
- footer.push(" , complete : function() { require(['" + controller_name + "_client" + "'], function(m) { m && m.init && m.init.apply(m, _b); })}");
- footer.push(" }");
- }
- footer.push(" ]);");
-
- footer.push("</script>");
-
return footer.join('\n');
};
View
@@ -2,7 +2,7 @@
"name": "rocket"
, "description": "The rapid development framework for node.js"
, "keywords": ["mvc", "model view controller", "comet","rapid development", "Rocket", "framework"]
-, "version": "0.2.4"
+, "version": "0.3.0"
, "homepage": "http://wavo.me"
, "repository":
{ "type" : "git"

0 comments on commit 07f5b08

Please sign in to comment.