geddy
Advanced tools
Comparing version 0.12.1 to 0.12.2
@@ -21,2 +21,5 @@ var fs = require('fs') | ||
// Pass geddy.config to helpers | ||
helpers.setConfig(app.config); | ||
// Create action helpers based on router | ||
@@ -23,0 +26,0 @@ var i = router.routes.length; |
@@ -23,4 +23,3 @@ /** | ||
, Data | ||
// FIXME: pass this config in | ||
, geddyConfig = (typeof geddy != 'undefined' && geddy.config) || {} | ||
, _config = {} | ||
, _getAssetPath; | ||
@@ -40,4 +39,4 @@ | ||
host = geddyConfig.assetHost || '' | ||
basePath = geddyConfig.assetBasePath || '/'; | ||
host = _config.assetHost || '' | ||
basePath = _config.assetBasePath || '/'; | ||
@@ -59,2 +58,3 @@ // Include poss. extra leading slash in path.join to ensure | ||
action: function (data) { | ||
helperUtils.setConfig(_config); | ||
Data = data; | ||
@@ -319,1 +319,5 @@ helperUtils.registerData(data); | ||
}; | ||
exports.setConfig = function (c) { | ||
_config = c; | ||
}; |
var utils = require('utilities') | ||
, geddyConfig = (typeof geddy != 'undefined' && geddy.config) || {} | ||
// Include empty params so that conditionals will work without registerData being called | ||
, Data = {params: {}}; | ||
, Data = {params: {}} | ||
, _config = {}; | ||
@@ -242,3 +242,3 @@ // Register Object for use with `exports.urls`, needs | ||
// Set default protocol if none is given | ||
if (geddyConfig.spdy || geddyConfig.ssl) { | ||
if (_config.spdy || _config.ssl) { | ||
protocol = protocol || 'https'; | ||
@@ -279,4 +279,4 @@ } else { | ||
if (geddyConfig.hostname) { | ||
domain = domain || geddyConfig.hostname; | ||
if (_config.hostname) { | ||
domain = domain || _config.hostname; | ||
} | ||
@@ -468,1 +468,5 @@ | ||
}; | ||
exports.setConfig = function (c) { | ||
_config = c; | ||
}; |
@@ -11,3 +11,3 @@ { | ||
], | ||
"version": "0.12.1", | ||
"version": "0.12.2", | ||
"author": "Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)", | ||
@@ -14,0 +14,0 @@ "dependencies": { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
30182
1421673