push.rocks/smartenv
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve dependency loop

Browse Source
This commit is contained in:
Philipp Kunz
2016-02-23 15:03:14 +01:00
parent 5636cf330e
commit b1464d97bf
6 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ts/smartenv.environment.ts
View File

@ -27,13 +27,13 @@ export var getEnv = function(){
*/
export var printEnv = function() {
if (this.getEnv().isNode) {
plugins.beautylog.ok("running on NODE");
console.log("running on NODE");
var smartenvVersion = require("../package.json").version;
plugins.beautylog.log("node version is " + this.getEnv().nodeVersion + " and smartenv version is " + smartenvVersion);
console.log("node version is " + this.getEnv().nodeVersion + " and smartenv version is " + smartenvVersion);
} else {
plugins.beautylog.ok("running on BROWSER");
plugins.beautylog.log("browser is " + this.getEnv().userAgent);
console.log("running on BROWSER");
console.log("browser is " + this.getEnv().userAgent);
}
plugins.beautylog.log("the smartenv registration store currently holds the following properties:");
console.log("the smartenv registration store currently holds the following properties:");
console.log(Object.getOwnPropertyNames(objectStorage.obs.getAll()));
};

10
ts/smartenv.objectstorage.ts
View File

@ -1,19 +1,19 @@
/// <reference path="typings/main.d.ts" />
import plugins = require("./smartenv.plugins");
var beautylog = require("beautylog");
export var obs:any = {
add: function(paramNameArg = "undefined",objectArg = "undefined") {
if (paramNameArg == "undefined"){
plugins.beautylog.error("paramName is undefined");
beautylog.error("paramName is undefined");
return;
}
if (objectArg == "undefined"){
plugins.beautylog.error("objectArg is undefined");
beautylog.error("objectArg is undefined");
}
if (typeof obsItems[paramNameArg] === "undefined"){
obsItems[paramNameArg] = objectArg;
} else {
plugins.beautylog.error("object is already present, so add operation has failed.");
beautylog.error("object is already present, so add operation has failed.");
}
return obsItems[paramNameArg];
},
@ -24,7 +24,7 @@ export var obs:any = {
if(!(typeof obsItems[paramNameArg] === "undefined")){
obsItems[paramNameArg] = plugins._.assign(obsItems[paramNameArg],objectArg);
} else {
plugins.beautylog.error("object is not present, so there is nothing to merge");
beautylog.error("object is not present, so there is nothing to merge");
}
},
get: function(keyName) {

1
ts/smartenv.plugins.ts
View File

@ -1,6 +1,5 @@
/// <reference path="typings/main.d.ts" />
var plugins = {
beautylog: require("beautylog"),
Q: require("q"),
_: require("lodash")
};