JS: Added ripple.config.load convenience function.

This commit is contained in:
Stefan Thomas
2013-02-02 14:05:37 +01:00
parent 4e526c78e6
commit 39ba2613d9
12 changed files with 37 additions and 45 deletions

View File

@@ -1,11 +1,9 @@
var buster = require("buster");
var Server = require("./server.js").Server;
var Remote = require("../src/js/remote.js").Remote;
var config = require("./config.js");
var Server = require("./server").Server;
var Remote = require("../src/js/remote").Remote;
var extend = require('extend');
extend(require('../src/js/config'), require('./config'));
var config = require('../src/js/config').load(require('./config'));
buster.testRunner.timeout = 5000;