Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

REMOVED - json2 and now passes boot args through script tag

  • Loading branch information...
commit abeac636d5c8e346b3b837adf9523b1b4a893622 1 parent ec23237
@glesperance authored
Showing with 9 additions and 15 deletions.
  1. +0 −5 lib/client/rocket-js/vendors/json2.min.js
  2. +9 −10 lib/controller.js
View
5 lib/client/rocket-js/vendors/json2.min.js
@@ -1,5 +0,0 @@
-/*
- http://www.JSON.org/json2.js
- 2011-10-19
-*/
-var JSON;if(!JSON){JSON={}}(function(){function str(a,b){var c,d,e,f,g=gap,h,i=b[a];if(i&&typeof i==="object"&&typeof i.toJSON==="function"){i=i.toJSON(a)}if(typeof rep==="function"){i=rep.call(b,a,i)}switch(typeof i){case"string":return quote(i);case"number":return isFinite(i)?String(i):"null";case"boolean":case"null":return String(i);case"object":if(!i){return"null"}gap+=indent;h=[];if(Object.prototype.toString.apply(i)==="[object Array]"){f=i.length;for(c=0;c<f;c+=1){h[c]=str(c,i)||"null"}e=h.length===0?"[]":gap?"[\n"+gap+h.join(",\n"+gap)+"\n"+g+"]":"["+h.join(",")+"]";gap=g;return e}if(rep&&typeof rep==="object"){f=rep.length;for(c=0;c<f;c+=1){if(typeof rep[c]==="string"){d=rep[c];e=str(d,i);if(e){h.push(quote(d)+(gap?": ":":")+e)}}}}else{for(d in i){if(Object.prototype.hasOwnProperty.call(i,d)){e=str(d,i);if(e){h.push(quote(d)+(gap?": ":":")+e)}}}}e=h.length===0?"{}":gap?"{\n"+gap+h.join(",\n"+gap)+"\n"+g+"}":"{"+h.join(",")+"}";gap=g;return e}}function quote(a){escapable.lastIndex=0;return escapable.test(a)?'"'+a.replace(escapable,function(a){var b=meta[a];return typeof b==="string"?b:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+a+'"'}function f(a){return a<10?"0"+a:a}"use strict";if(typeof Date.prototype.toJSON!=="function"){Date.prototype.toJSON=function(a){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(a){return this.valueOf()}}var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;if(typeof JSON.stringify!=="function"){JSON.stringify=function(a,b,c){var d;gap="";indent="";if(typeof c==="number"){for(d=0;d<c;d+=1){indent+=" "}}else if(typeof c==="string"){indent=c}rep=b;if(b&&typeof b!=="function"&&(typeof b!=="object"||typeof b.length!=="number")){throw new Error("JSON.stringify")}return str("",{"":a})}}if(typeof JSON.parse!=="function"){JSON.parse=function(text,reviver){function walk(a,b){var c,d,e=a[b];if(e&&typeof e==="object"){for(c in e){if(Object.prototype.hasOwnProperty.call(e,c)){d=walk(e,c);if(d!==undefined){e[c]=d}else{delete e[c]}}}}return reviver.call(a,b,e)}var j;text=String(text);cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){j=eval("("+text+")");return typeof reviver==="function"?walk({"":j},""):j}throw new SyntaxError("JSON.parse")}}})()
View
19 lib/controller.js
@@ -48,26 +48,25 @@ var rocket_tmpl = {};
;
footer.push("<script>");
-
+
+ footer.push("var d1 = " + JSON.stringify(Date.now()));
+ 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([");
- footer.push(" { test : window.JSON");
- footer.push(" , nope: '/js/rocket/vendors/json2.min.js'");
- footer.push(" }");
-
+
if (typeof controller_name) {
- footer.push(" , { load : '/js/rocket/vendors/require-1.0.6.min.js' }");
+ 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'");
- footer.push(" , complete : function() { require(['" + controller_name + "_client" + "'], function(m) { m && m.init && m.init.apply(m" + (args.length > 0 ? ", " + 'JSON.parse(decodeURIComponent("' + encodeURIComponent(JSON.stringify(args)) + '"))' : '') + "); })}");
+ 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');

0 comments on commit abeac63

Please sign in to comment.
Something went wrong with that request. Please try again.